This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch optimize_travis in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1f8f41a3fb9cec6b5162ce75148d5dc97ace56f4 Merge: c0843b3 8b3fcb2 Author: xiangdong huang <[email protected]> AuthorDate: Sun Apr 5 08:43:46 2020 +0800 Merge remote-tracking branch 'origin/master' into optimize_travis Jenkinsfile | 4 +- README.md | 4 +- docs/Community/Community-History&Vision.md | 6 +- docs/Community/Community-Powered By.md | 10 +- docs/Community/Community-Project Committers.md | 33 +--- docs/Development/ContributeGuide.md | 101 ++++++++++ docs/Development/Development-Contributing.md | 214 --------------------- docs/Development/Development-Document.md | 51 ----- docs/Development/Development-IDE.md | 113 ----------- docs/Development/VoteRelease.md | 202 +++++++++++++++++++ docs/SystemDesign/1-TsFile/2-Format.md | 24 ++- docs/SystemDesign/5-DataQuery/1-DataQuery.md | 3 + .../5-DataQuery/8-ModificationHandle.md | 63 ++++++ .../2-DML Data Manipulation Language.md | 34 ++-- .../{ => zh}/Community/Community-History&Vision.md | 0 docs/{ => zh}/Community/Community-Powered By.md | 0 .../Community/Community-Project Committers.md} | 8 +- docs/zh/Development/ContributeGuide.md | 6 +- docs/zh/SystemDesign/1-TsFile/2-Format.md | 24 ++- docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 3 + .../5-DataQuery/8-ModificationHandle.md | 63 ++++++ .../2-DML Data Manipulation Language.md | 27 +-- example/kafka/readme.md | 2 +- example/rocketmq/readme.md | 8 +- .../main/java/org/apache/iotdb/SessionExample.java | 1 - .../java/org/apache/iotdb/flink/IoTDBSink.java | 32 +-- .../iotdb/flink/IoTDBSinkBatchInsertTest.java | 22 +-- .../iotdb/flink/IoTDBSinkBatchTimerTest.java | 14 +- .../apache/iotdb/flink/IoTDBSinkInsertTest.java | 12 +- hadoop/README.md | 2 +- hadoop/pom.xml | 55 ++++++ jdbc/README.md | 23 +++ jdbc/osgi.bnd | 31 +++ jdbc/pom.xml | 97 ++++++++++ jdbc/src/main/feature/feature.xml | 35 ++++ .../main/java/org/apache/iotdb/jdbc/Activator.java | 40 ++++ .../org/apache/iotdb/jdbc/IoTDBDataSource.java | 146 ++++++++++++++ .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +- .../java/org/apache/iotdb/jdbc/IoTDBDriver.java | 4 +- .../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 92 ++++++++- .../apache/iotdb/jdbc/IoTDbDataSourceFactory.java | 79 ++++++++ .../resources/services/META-INF/java.sql.Driver | 14 +- pom.xml | 5 - .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 3 +- .../engine/storagegroup/StorageGroupProcessor.java | 95 ++------- .../db/engine/storagegroup/TsFileProcessor.java | 2 +- .../db/engine/storagegroup/TsFileResource.java | 49 +++++ .../apache/iotdb/db/qp/executor/PlanExecutor.java | 55 +++--- .../db/qp/physical/crud/RawDataQueryPlan.java | 12 +- .../groupby/GroupByWithValueFilterDataSet.java | 2 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 2 +- .../db/query/executor/AggregationExecutor.java | 12 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 2 +- .../db/query/executor/RawDataQueryExecutor.java | 4 +- .../adapter/ByTimestampReaderAdapter.java | 46 ++--- .../db/query/reader/chunk/ChunkReaderWrap.java | 4 +- .../db/query/reader/chunk/DiskChunkLoader.java | 5 +- .../reader/chunk/DiskChunkReaderByTimestamp.java | 55 +++--- .../db/query/reader/chunk/MemChunkLoader.java | 5 +- .../db/query/reader/chunk/MemChunkReader.java | 2 +- .../chunk/metadata/DiskChunkMetadataLoader.java | 2 +- .../chunk/metadata/MemChunkMetadataLoader.java | 2 +- .../db/query/reader/series/IReaderByTimestamp.java | 14 +- .../iotdb/db/query/reader/series/SeriesReader.java | 34 +--- .../reader/series/SeriesReaderByTimestamp.java | 24 +-- .../query/timegenerator/ServerTimeGenerator.java | 2 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 44 ++++- .../org/apache/iotdb/db/utils/FilePathUtils.java | 1 + .../writelog/recover/TsFileRecoverPerformer.java | 7 +- .../conf/adapter/ActiveTimeSeriesCounterTest.java | 10 +- ...yMergeTest.java => IoTDBFlushQueryMergeIT.java} | 2 +- ...ileTest.java => IoTDBLoadExternalTsfileIT.java} | 4 +- .../iotdb/db/integration/IoTDBRestartIT.java | 87 +++++++++ ...impleQueryTest.java => IoTDBSimpleQueryIT.java} | 2 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 5 + .../db/writelog/recover/SeqTsFileRecoverTest.java | 4 + .../writelog/recover/UnseqTsFileRecoverTest.java | 6 +- service-rpc/pom.xml | 55 ++++++ .../org/apache/iotdb/session/IoTDBSessionIT.java | 8 + site/src/main/.vuepress/components/Home.vue | 17 +- site/src/main/.vuepress/components/Home_zh.vue | 17 +- site/src/main/.vuepress/config.js | 4 +- site/src/main/.vuepress/public/css/index.css | 21 +- tsfile/pom.xml | 55 ++++++ .../metadata/ChunkGroupMetadata.java} | 29 ++- .../tsfile/file/metadata/TimeseriesMetadata.java | 4 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 70 +++---- .../read/controller/CachedChunkLoaderImpl.java | 4 +- .../iotdb/tsfile/read/controller/IChunkLoader.java | 6 +- .../read/controller/IChunkMetadataLoader.java | 2 +- .../read/query/timegenerator/TimeGenerator.java | 36 +--- .../read/query/timegenerator/node/AndNode.java | 99 +++------- .../read/query/timegenerator/node/LeafNode.java | 65 ++++--- .../tsfile/read/query/timegenerator/node/Node.java | 5 +- .../read/query/timegenerator/node/OrNode.java | 119 +++++------- .../iotdb/tsfile/read/reader/IChunkReader.java | 2 +- .../tsfile/read/reader/chunk/ChunkReader.java | 2 +- .../read/reader/series/FileSeriesReader.java | 2 +- .../reader/series/FileSeriesReaderByTimestamp.java | 2 +- .../write/writer/RestorableTsFileIOWriter.java | 47 +++-- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 90 +++++---- .../tsfile/read/controller/ChunkLoaderTest.java | 2 +- .../tsfile/read/query/timegenerator/NodeTest.java | 30 +-- .../tsfile/read/reader/FakedMultiBatchReader.java} | 41 +++- .../tsfile/read/reader/FakedTimeGenerator.java | 73 +++++++ 106 files changed, 2036 insertions(+), 1198 deletions(-)
