This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch cluster in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 3577857d40b08fb45ab9803c94b5eb742aa29e87 Author: lta <[email protected]> AuthorDate: Tue May 21 09:48:56 2019 +0800 fix a bug --- .../db/engine/modification/io/LocalTextModificationAccessor.java | 1 + .../org/apache/iotdb/db/query/control/QueryResourceManager.java | 1 + .../iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java | 4 ++++ .../db/query/dataset/groupby/GroupByWithValueFilterDataSet.java | 8 ++++---- .../src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 5 +++++ iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java | 3 +++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java index 9e86400..b1a60cf 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java @@ -55,6 +55,7 @@ public class LocalTextModificationAccessor implements ModificationReader, Modifi public LocalTextModificationAccessor(String filePath) { this.filePath = filePath; } + @Override public Collection<Modification> read() throws IOException { BufferedReader reader; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java index c5f029e..612f71a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java @@ -164,6 +164,7 @@ public class QueryResourceManager { throws FileNodeManagerException { SingleSeriesExpression singleSeriesExpression = new SingleSeriesExpression(selectedPath, null); + System.out.println("查询的path为：" + selectedPath); QueryDataSource queryDataSource = FileNodeManager.getInstance() .query(singleSeriesExpression, context); diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java index bc9bb08..fd1d393 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java @@ -60,10 +60,12 @@ public class EngineDataSetWithoutTimeGenerator extends QueryDataSet { throws IOException { super(paths, dataTypes); this.readers = readers; + System.out.println("EngineDataSetWithoutTimeGenerator inner set"); initHeap(); } private void initHeap() throws IOException { + System.out.println("Start init heap"); timeSet = new HashSet<>(); timeHeap = new PriorityQueue<>(); cacheTimeValueList = new TimeValuePair[readers.size()]; @@ -72,10 +74,12 @@ public class EngineDataSetWithoutTimeGenerator extends QueryDataSet { IPointReader reader = readers.get(i); if (reader.hasNext()) { TimeValuePair timeValuePair = reader.next(); + System.out.println(timeValuePair); cacheTimeValueList[i] = timeValuePair; timeHeapPut(timeValuePair.getTimestamp()); } } + System.out.println("Stop init heap"); } @Override diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java index f7ffa29..2991ff7 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java @@ -54,7 +54,7 @@ public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet { /** * group by batch calculation size. */ - private int timeStampFetchSize; + private int timestampFetchSize; /** * constructor. @@ -63,7 +63,7 @@ public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet { List<Pair<Long, Long>> mergedIntervals) { super(jobId, paths, unit, origin, mergedIntervals); this.allDataReaderList = new ArrayList<>(); - this.timeStampFetchSize = 10 * IoTDBDescriptor.getInstance().getConfig().getFetchSize(); + this.timestampFetchSize = 10 * IoTDBDescriptor.getInstance().getConfig().getFetchSize(); } /** @@ -92,7 +92,7 @@ public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet { function.init(); } - long[] timestampArray = new long[timeStampFetchSize]; + long[] timestampArray = new long[timestampFetchSize]; int timeArrayLength = 0; if (hasCachedTimestamp) { if (timestamp < endTime) { @@ -140,7 +140,7 @@ public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet { */ private int constructTimeArrayForOneCal(long[] timestampArray, int timeArrayLength) throws IOException { - for (int cnt = 1; cnt < timeStampFetchSize && timestampGenerator.hasNext(); cnt++) { + for (int cnt = 1; cnt < timestampFetchSize && timestampGenerator.hasNext(); cnt++) { timestamp = timestampGenerator.next(); if (timestamp < endTime) { timestampArray[timeArrayLength++] = timestamp; 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 b02f1c2..0ff4995 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 @@ -673,12 +673,17 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext { int fetchSize = req.getFetch_size(); QueryDataSet queryDataSet; if (!queryRet.get().containsKey(statement)) { + System.out.println("Create new data set"); queryDataSet = createNewDataSet(statement, fetchSize, req); + System.out.println("Create new data set success"); + LOGGER.error("Create new data set success."); } else { queryDataSet = queryRet.get().get(statement); } + System.out.println("Get next value"); TSQueryDataSet result = Utils.convertQueryDataSetByFetchSize(queryDataSet, fetchSize); boolean hasResultSet = !result.getRecords().isEmpty(); + System.out.println("hasResultSet : " + hasResultSet); if (!hasResultSet && queryRet.get() != null) { queryRet.get().remove(statement); } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java index 75826da..03a5a2f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java @@ -47,8 +47,11 @@ public class Utils { tsQueryDataSet.setRecords(new ArrayList<>()); for (int i = 0; i < fetchsize; i++) { if (queryDataSet.hasNext()) { + System.out.println("Get value in convertQueryDataSetByFetchSize"); RowRecord rowRecord = queryDataSet.next(); + System.out.println(rowRecord); tsQueryDataSet.getRecords().add(convertToTSRecord(rowRecord)); + System.out.println("Get value success in convertQueryDataSetByFetchSize"); } else { break; }
