This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch fix_group_by_fill in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 531344b44342b258f3d4b529bf15c2e656498387 Merge: 042a7c8 a358047 Author: JackieTien97 <[email protected]> AuthorDate: Wed May 27 11:29:58 2020 +0800 resolve conflicts docs/UserGuide/Client/Status Codes.md | 4 ++-- .../Operation Manual/DML Data Manipulation Language.md | 4 ++-- docs/UserGuide/Operation Manual/SQL Reference.md | 2 ++ docs/zh/UserGuide/Client/Status Codes.md | 4 ++-- .../Operation Manual/DML Data Manipulation Language.md | 9 +++++---- docs/zh/UserGuide/Operation Manual/SQL Reference.md | 2 ++ .../src/main/java/org/apache/iotdb/SessionExample.java | 4 ++-- .../iotdb/db/exception/metadata/MetadataException.java | 3 +-- .../exception/metadata/StorageGroupAlreadySetException.java | 5 ++++- .../main/java/org/apache/iotdb/db/metadata/MManager.java | 10 +++------- .../iotdb/db/query/dataset/groupby/GroupByFillDataSet.java | 7 +++++-- .../apache/iotdb/db/writelog/io/SingleFileLogReader.java | 2 +- .../src/main/java/org/apache/iotdb/rpc/RpcUtils.java | 3 +-- .../org/apache/iotdb/rpc/StatementExecutionException.java | 13 +++++++++++++ 14 files changed, 45 insertions(+), 27 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillDataSet.java index 8eeb87f,9be9e91..3ad751a --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillDataSet.java @@@ -117,7 -119,7 +119,8 @@@ public class GroupByFillDataSet extend (fillTypes.containsKey(dataTypes.get(i)) && !((PreviousFill) fillTypes .get(dataTypes.get(i))).isUntilLast()) || rowRecord.getTimestamp() <= lastTimeArray[i]) && ( -- !fillTypes.containsKey(dataTypes.get(i)) || ((PreviousFill) fillTypes.get(dataTypes.get(i))).getBeforeRange() < 0 ++ !fillTypes.containsKey(dataTypes.get(i)) ++ || ((PreviousFill) fillTypes.get(dataTypes.get(i))).getBeforeRange() < 0 || ((PreviousFill) fillTypes.get(dataTypes.get(i))).getBeforeRange() >= groupByEngineDataSet.interval)) { rowRecord.getFields().set(i, Field.getField(previousValue[i], dataTypes.get(i)));
