This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch win_e_option in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit cefe024303a47afac80b5c145d539df744280a63 Merge: ae0a373 1275474 Author: EJTTianyu <[email protected]> AuthorDate: Mon May 11 15:15:47 2020 +0800 Merge branch 'master' of github.com:apache/incubator-iotdb into origin_master .gitignore | 3 + LICENSE-binary | 2 +- .../java/org/apache/iotdb/cli/AbstractCli.java | 8 +- docs/SystemDesign/1-TsFile/2-Format.md | 283 ++++++++++---- .../2-DML Data Manipulation Language.md | 4 +- .../3-Account Management Statements.md | 2 +- docs/UserGuide/6-System Tools/3-JMX Tool.md | 47 +-- .../2-DML Data Manipulation Language.md | 4 +- .../3-Account Management Statements.md | 2 +- docs/zh/UserGuide/6-System Tools/3-JMX Tool.md | 59 +-- .../main/java/org/apache/iotdb/SessionExample.java | 40 +- .../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 2 +- .../apache/iotdb/hadoop/fileSystem/HDFSInput.java | 45 +-- .../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 15 +- ...ultSet.java => AbstractIoTDBJDBCResultSet.java} | 273 ++++++-------- .../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 93 +++++ ...ultSet.java => IoTDBNonAlignJDBCResultSet.java} | 110 +++--- .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 203 ----------- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +- ...ultSetTest.java => IoTDBJDBCResultSetTest.java} | 2 +- pom.xml | 2 +- .../resources/conf/iotdb-engine.properties | 4 +- .../org/apache/iotdb/db/metadata/MManager.java | 14 + .../java/org/apache/iotdb/db/metadata/MTree.java | 20 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 + .../iotdb/db/qp/strategy/PhysicalGenerator.java | 26 +- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 27 +- .../query/dataset/groupby/GroupByFillDataSet.java | 3 +- .../dataset/groupby/LocalGroupByExecutor.java | 6 +- .../db/query/executor/AggregationExecutor.java | 31 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 9 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 122 +++++-- .../apache/iotdb/db/tools/TsFileSketchTool.java | 104 ++++-- .../writelog/recover/TsFileRecoverPerformer.java | 2 +- .../apache/iotdb/db/integration/IoTDBAliasIT.java | 273 ++++++++++++++ .../iotdb/db/integration/IoTDBGroupByFillIT.java | 60 ++- .../IoTDBMultiOverlappedChunkInUnseqIT.java | 17 +- .../db/integration/IoTDBMultiOverlappedPageIT.java | 42 ++- .../apache/iotdb/db/integration/IoTDBTagIT.java | 32 ++ .../org/apache/iotdb/db/metadata/MTreeTest.java | 14 + .../recover/RecoverResourceFromReaderTest.java | 189 ++++++++++ service-rpc/pom.xml | 5 + .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 406 +++++++++++++++++++++ .../java/org/apache/iotdb/session/Session.java | 2 +- .../org/apache/iotdb/session/SessionDataSet.java | 298 +++++++-------- .../iotdb/session/pool/SessionDataSetWrapper.java | 4 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 8 +- .../iotdb/session/IoTDBSessionIteratorIT.java | 122 +++++++ .../org/apache/iotdb/spark/db/Converter.scala | 4 +- .../file/metadata/statistics/BinaryStatistics.java | 2 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 41 +-- .../org/apache/iotdb/tsfile/read/common/Path.java | 8 +- 52 files changed, 2175 insertions(+), 936 deletions(-)
