This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch jira_444 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 131dddb12f12a9c4d3a3f92d92d73b7767d46356 Merge: 95c7a56 9fef008 Author: samperson1997 <[email protected]> AuthorDate: Wed Feb 26 18:46:07 2020 +0800 Merge remote-tracking branch 'upstream/master' # Conflicts: # server/src/main/java/org/apache/iotdb/db/metadata/MTree.java # server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java README.md | 2 +- client-py/src/client_example.py | 33 +-- .../SystemDesign/1-TsFile/3-Write.md | 8 +- .../4-StorageEngine/1-StorageEngine.md | 30 +-- .../4-StorageEngine/5-DataPartition.md | 86 +++++++ .../4-StorageEngine/6-DataManipulation.md | 96 ++++++++ .../SystemDesign/7-Connector/3-Spark-TsFile.md | 101 ++++++++ .../SystemDesign/7-Connector/4-Spark-IOTDB.md | 89 +++++++ .../UserGuide/0-Get Started/1-QuickStart.md | 2 +- .../UserGuide/4-Client/6-Status Codes.md | 65 +++++ docs/Documentation/SystemDesign/0-Content.md | 6 +- docs/Documentation/UserGuide/0-Content.md | 1 + .../UserGuide/0-Get Started/1-QuickStart.md | 2 +- .../UserGuide/4-Client/6-Status Codes.md | 66 ++++++ .../org/apache/iotdb/jdbc/IoTDBConnection.java | 27 ++- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +- .../db/query/aggregation/AggregateResult.java | 95 +++++++- .../db/query/aggregation/AggregationType.java | 100 ++++++++ .../db/query/aggregation/impl/AvgAggrResult.java | 33 ++- .../db/query/aggregation/impl/CountAggrResult.java | 19 +- .../aggregation/impl/FirstValueAggrResult.java | 38 ++- .../aggregation/impl/LastValueAggrResult.java | 38 ++- .../query/aggregation/impl/MaxTimeAggrResult.java | 24 +- .../query/aggregation/impl/MaxValueAggrResult.java | 20 +- .../query/aggregation/impl/MinTimeAggrResult.java | 25 +- .../query/aggregation/impl/MinValueAggrResult.java | 21 +- .../db/query/aggregation/impl/SumAggrResult.java | 32 ++- .../groupby/GroupByWithValueFilterDataSet.java | 14 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 6 +- .../db/query/executor/AggregationExecutor.java | 8 +- ...ultFactory.java => AggregateResultFactory.java} | 42 +++- .../org/apache/iotdb/db/service/TSServiceImpl.java | 19 +- .../iotdb/db/integration/IoTDBAggregationIT.java | 8 +- .../integration/IoTDBAggregationSmallDataIT.java | 2 +- .../integration/IoTDBLoadExternalTsfileTest.java | 2 +- .../iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 +- .../db/query/aggregation/AggregateResultTest.java | 263 +++++++++++++++++++++ .../iotdb/db/query/component/SimpleFileWriter.java | 54 ----- .../reader/series/SeriesAggregateReaderTest.java | 4 +- server/src/test/resources/logback.xml | 9 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 2 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 +- service-rpc/src/main/thrift/rpc.thrift | 3 +- .../java/org/apache/iotdb/session/Session.java | 14 +- .../org/apache/iotdb/spark/db/Converter.scala | 37 +-- .../org/apache/iotdb/spark/db/DefaultSource.scala | 37 +-- .../org/apache/iotdb/spark/db/IoTDBOptions.scala | 37 +-- .../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 37 +-- .../org/apache/iotdb/spark/db/IoTDBRelation.scala | 37 +-- .../org/apache/iotdb/spark/db/Transformer.scala | 37 +-- .../scala/org/apache/iotdb/spark/db/package.scala | 37 +-- .../org/apache/iotdb/spark/db/IoTDBTest.scala | 37 +-- .../org/apache/iotdb/spark/tsfile/Converter.scala | 37 +-- .../apache/iotdb/spark/tsfile/DefaultSource.scala | 36 +-- .../iotdb/spark/tsfile/NarrowConverter.scala | 37 +-- .../spark/tsfile/NarrowTsFileOutputWriter.scala | 37 +-- .../apache/iotdb/spark/tsfile/Transformer.scala | 37 +-- .../iotdb/spark/tsfile/TsFileWriterFactory.scala | 36 +-- .../apache/iotdb/spark/tsfile/WideConverter.scala | 37 +-- .../spark/tsfile/WideTsFileOutputWriter.scala | 37 +-- .../org/apache/iotdb/spark/tsfile/package.scala | 36 +-- .../apache/iotdb/spark/tsfile/ConverterTest.scala | 37 +-- .../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 37 +-- .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 14 +- .../apache/iotdb/tsfile/write/page/PageWriter.java | 12 +- 65 files changed, 1692 insertions(+), 563 deletions(-)
