You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/10 08:04:09 UTC
[incubator-iotdb] branch master updated: remove useless fetchsize
in some places (#228)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9960180 remove useless fetchsize in some places (#228)
9960180 is described below
commit 996018068dae4e81b95a993999c25e25b5fdfd5a
Author: RUI, LEI <33...@users.noreply.github.com>
AuthorDate: Wed Jul 10 16:04:05 2019 +0800
remove useless fetchsize in some places (#228)
---
.../iotdb/db/qp/executor/AbstractQueryProcessExecutor.java | 13 -------------
.../apache/iotdb/db/qp/executor/IQueryProcessExecutor.java | 4 ----
.../java/org/apache/iotdb/db/service/TSServiceImpl.java | 12 +++++++-----
.../java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 4 ----
.../src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java | 13 +++++--------
5 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
index 65e476a..b3cb92c 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
@@ -43,7 +43,6 @@ import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
public abstract class AbstractQueryProcessExecutor implements IQueryProcessExecutor {
- protected ThreadLocal<Integer> fetchSize = new ThreadLocal<>();
protected IEngineQueryRouter queryRouter = new EngineQueryRouter();
@Override
@@ -87,18 +86,6 @@ public abstract class AbstractQueryProcessExecutor implements IQueryProcessExecu
return queryRouter.query(queryExpression, context);
}
- @Override
- public int getFetchSize() {
- if (fetchSize.get() == null) {
- return 100;
- }
- return fetchSize.get();
- }
-
- @Override
- public void setFetchSize(int fetchSize) {
- this.fetchSize.set(fetchSize);
- }
@Override
public boolean delete(DeletePlan deletePlan) throws ProcessorException {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
index bd6b516..a6aefd6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
@@ -126,8 +126,4 @@ public interface IQueryProcessExecutor {
*/
List<String> getAllPaths(String originPath) throws MetadataErrorException;
- int getFetchSize();
-
- void setFetchSize(int fetchSize);
-
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 282f8be..5071eef 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -664,25 +664,28 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
if (!checkLogin()) {
return getTSFetchResultsResp(TS_StatusCode.ERROR_STATUS, "Not login.");
}
- String statement = req.getStatement();
+ String statement = req.getStatement();
if (!queryStatus.get().containsKey(statement)) {
return getTSFetchResultsResp(TS_StatusCode.ERROR_STATUS, "Has not executed statement");
}
- int fetchSize = req.getFetch_size();
QueryDataSet queryDataSet;
if (!queryRet.get().containsKey(statement)) {
- queryDataSet = createNewDataSet(statement, fetchSize, req);
+ queryDataSet = createNewDataSet(statement, req);
} else {
queryDataSet = queryRet.get().get(statement);
}
+
+ int fetchSize = req.getFetch_size();
TSQueryDataSet result = QueryDataSetUtils
.convertQueryDataSetByFetchSize(queryDataSet, fetchSize);
+
boolean hasResultSet = !result.getRecords().isEmpty();
if (!hasResultSet && queryRet.get() != null) {
queryRet.get().remove(statement);
}
+
TSFetchResultsResp resp = getTSFetchResultsResp(TS_StatusCode.SUCCESS_STATUS,
"FetchResult successfully. Has more result: " + hasResultSet);
resp.setHasResultSet(hasResultSet);
@@ -694,11 +697,10 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
}
- protected QueryDataSet createNewDataSet(String statement, int fetchSize, TSFetchResultsReq req)
+ protected QueryDataSet createNewDataSet(String statement, TSFetchResultsReq req)
throws PathErrorException, QueryFilterOptimizationException, StorageEngineException,
ProcessorException, IOException {
PhysicalPlan physicalPlan = queryStatus.get().get(statement);
- processor.getExecutor().setFetchSize(fetchSize);
QueryDataSet queryDataSet;
QueryContext context = new QueryContext(QueryResourceManager.getInstance().assignJobId());
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
index 2e5bcd9..32016b1 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
@@ -62,10 +62,6 @@ public class MemIntQpExecutor extends AbstractQueryProcessExecutor {
private TreeSet<Long> timeStampUnion = new TreeSet<>();
private Map<String, List<String>> fakeAllPaths;
- public MemIntQpExecutor() {
- this.fetchSize.set(5);
- }
-
public void setFakeAllPaths(Map<String, List<String>> fakeAllPaths) {
this.fakeAllPaths = fakeAllPaths;
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
index e9340ba..ade9f51 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -45,23 +45,19 @@ import org.apache.iotdb.service.rpc.thrift.TSOperationHandle;
import org.apache.iotdb.service.rpc.thrift.TS_SessionHandle;
import org.apache.iotdb.service.rpc.thrift.TS_StatusCode;
import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class IoTDBStatement implements Statement {
private static final String SHOW_TIMESERIES_COMMAND_LOWERCASE = "show timeseries";
private static final String SHOW_STORAGE_GROUP_COMMAND_LOWERCASE = "show storage group";
private static final String METHOD_NOT_SUPPORTED_STRING = "Method not supported";
- private static final Logger logger = LoggerFactory
- .getLogger(IoTDBStatement.class);
ZoneId zoneId;
private ResultSet resultSet = null;
private IoTDBConnection connection;
- private int fetchSize = Config.fetchSize;
+ private int fetchSize;
private int queryTimeout = 10;
- protected TSIService.Iface client = null;
- private TS_SessionHandle sessionHandle = null;
+ protected TSIService.Iface client;
+ private TS_SessionHandle sessionHandle;
private TSOperationHandle operationHandle = null;
private List<String> batchSQLList;
private AtomicLong queryId = new AtomicLong(0);
@@ -375,7 +371,8 @@ public class IoTDBStatement implements Statement {
return executeUpdateSQL(sql);
} catch (TException e2) {
throw new SQLException(
- "Fail to execute update " + sql + "after reconnecting. please check server status", e2);
+ "Fail to execute update " + sql + "after reconnecting. please check server status",
+ e2);
}
} else {
throw new SQLException(