You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/04/09 03:31:07 UTC
[incubator-iotdb] branch upgrade_tool updated (e7ba1f0 -> 6b5d253)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch upgrade_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from e7ba1f0 Merge branch 'upgrade_tool' of https://github.com/apache/incubator-iotdb into upgrade_tool
add 781f9da move old files to upgrade folder
add 7d350ba rollback TimeGenerator (#964)
add 3f427f9 fix javadoc format
add 9c1ac1d modify config.js zh/development (#969)
add a5eba32 add timegenerator test (#971)
add a8f439b update last doc (#972)
add 6797b44 rename some methods and move the load related methods to FileLoaderUtil class
add 25cb550 rename some methods and move the load related methods to FileLoaderUtil class (#974)
add 8592180 Fix bugs of set core-site.xml and hdfs-site.xml paths in HDFS storage (#973)
add 5c27e55 add tsfile new format figure (#978)
add fbd027d change sensor to measurement (#977)
add e7a8fe6 update tsfile format figure
add f945114 modify vue home (#976)
add 2992a9d add docs for deletion handle in query (#980)
add 385bdcb Replace the Badge of codecov to coveralls (#984)
add 4e288af [IOTDB-576] Use SessionPool for Flink Connector instead of Session (#982)
add 8b3fcb2 Make JDBC OSGi usable and added a feature file (#952)
add a63bd82 fix concurrent auto create schema bug (#989)
add c4c9189 [HOTFIX] fix typo in rocketmq example (#990)
add 18c112c update doc for Writing data on HDFS
add 41c85a4 remove tsfile-format.properties
add 7e8299d modify website (#988)
add 6d80fc9 Merge remote-tracking branch 'origin/master'
add 3565f13 update delete doc
add e2927d5 [IOTDB-579]Optimize travis for readability and add more modules for code coverage (#992)
add 928566c update server download doc
add 07f755c remove .~2-Data Type
add 4a2c5b0 change file writer open log to debug level
add 404e1bf remove catch Exception in StorageEngine.insert()
add 85ee188 change Exception to QueryProcessException in AbstractMemTable.insert
add 1017067 add zh_readme (#999)
add 7c0d5eb modify docs (#993)
add 829dab4 [IOTDB-581] Add flink to the site home page (#995)
add e690c1b [IOTDB-575] JMX authenticate configuration (#979)
add fb351c3 Fix typo in quick start (#1003)
add 6abd1bf Add max backup log file number (#1001)
add 9d77616 Add TsFile writing to HDFS example (#994)
add b3f3540 fix concurrent modification error in upgrade (#1004)
add 644d441 fix meet incompatible file error in restart (#1005)
add 1a8fcd3 fix RestorableTsFileIOWriterTest
add 48b0360 not delete incompatible file in file level api (#1007)
add 0f782ad add TsFileInputFormat for reading TsFiles in flink.
add 2feb0ce try to fix windows test
add bee90f7 add docs and rename util classes.
add 4652631 address comments and push to test travis changes.
add 4846b4a fix compile error caused by rebase
add b24cdde fix compile error caused by rebase and add a new test to help maintain the TSFileConfigUtil.
add af683dd enable compression in session pool
add 4bc238f ignore S107
add d6207c0 [IOTDB-565] MQTT Protocol Support (#929)
add 6b5d253 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.travis.yml | 111 ++---
LICENSE | 8 +
LICENSE-binary | 2 +-
README.md | 9 +-
README_ZH.md | 379 +++++++++++++++
.../main/java/org/apache/iotdb/client/Client.java | 2 +-
.../java/org/apache/iotdb/client/WinClient.java | 3 +
client/src/test/resources/logback.xml | 12 +-
docs/SystemDesign/1-TsFile/2-Format.md | 24 +-
docs/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 73 +++
docs/SystemDesign/release.adoc | 519 ---------------------
docs/UserGuide/0-Get Started/1-QuickStart.md | 8 +-
docs/UserGuide/2-Concept/.~2-Data Type.md | 43 --
.../2-Concept/1-Data Model and Terminology.md | 6 +-
docs/UserGuide/2-Concept/2-Data Type.md | 2 +-
.../UserGuide/4-Client/1-Command Line Interface.md | 10 +-
.../4-Client/5-Programming - TsFile API.md | 14 +-
docs/UserGuide/4-Client/6-Programming - MQTT.md | 100 ++++
.../{6-Status Codes.md => 7-Status Codes.md} | 0
.../2-DML Data Manipulation Language.md | 34 +-
docs/UserGuide/6-System Tools/3-JMX Tool.md | 22 +
.../8-Architecture/2-Writing Data on HDFS.md | 4 +-
.../2-Single Node Setup.md => UserGuideReadme.md} | 15 +-
docs/zh/SystemDesign/1-TsFile/2-Format.md | 24 +-
docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 73 +++
docs/zh/UserGuide/0-Get Started/1-QuickStart.md | 2 +-
.../2-Concept/1-Data Model and Terminology.md | 6 +-
docs/zh/UserGuide/2-Concept/2-Data Type.md | 2 +-
docs/zh/UserGuide/2-Concept/3-Encoding.md | 2 +-
docs/zh/UserGuide/3-Server/1-Download.md | 2 +-
.../UserGuide/4-Client/1-Command Line Interface.md | 10 +-
.../4-Client/5-Programming - TsFile API.md | 14 +-
.../2-DML Data Manipulation Language.md | 27 +-
docs/zh/UserGuide/6-System Tools/3-JMX Tool.md | 22 +
.../8-Architecture/2-Writing Data on HDFS.md | 4 +-
docs/zh/UserGuide/README.md | 27 --
.../UserGuide/UserGuideReadme.md} | 15 +-
example/flink/README.md | 10 +-
example/flink/pom.xml | 7 +-
.../org/apache/iotdb/flink/FlinkIoTDBSink.java | 6 -
.../apache/iotdb/flink/FlinkTsFileBatchSource.java | 80 ++++
.../iotdb/flink/FlinkTsFileStreamSource.java | 84 ++++
.../java/org/apache/iotdb/flink/TsFlieUtils.java | 72 +++
.../iotdb/hadoop/tsfile/TsFileWriteToHDFS.java} | 53 +--
example/kafka/readme.md | 2 +-
example/{flink => mqtt}/README.md | 8 +-
example/{tsfile => mqtt}/pom.xml | 10 +-
.../java/org/apache/iotdb/mqtt/MQTTClient.java | 50 ++
example/pom.xml | 1 +
example/rocketmq/readme.md | 8 +-
.../apache/iotdb/rocketmq/RocketMQConsumer.java | 2 +-
.../java/org/apache/iotdb/flink/IoTDBSink.java | 32 +-
.../iotdb/flink/IoTDBSinkBatchInsertTest.java | 22 +-
.../iotdb/flink/IoTDBSinkBatchTimerTest.java | 14 +-
.../apache/iotdb/flink/IoTDBSinkInsertTest.java | 12 +-
flink-tsfile-connector/README.md | 93 ++++
{example/flink => flink-tsfile-connector}/pom.xml | 19 +-
.../apache/iotdb/flink/tsfile/RowRecordParser.java | 46 ++
.../iotdb/flink/tsfile/RowRowRecordParser.java | 120 +++++
.../iotdb/flink/tsfile/TsFileInputFormat.java | 168 +++++++
.../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 65 +++
.../flink/tsfile/RowTsFileInputFormatITCase.java | 109 +++++
.../flink/tsfile/RowTsFileInputFormatTest.java | 89 ++++
.../flink/tsfile/RowTsFileInputFormatTestBase.java | 118 +++++
.../util/TSFileConfigUtilCompletenessTest.java | 84 ++++
.../apache/iotdb/flink/util/TsFileWriteUtil.java | 230 +++++++++
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 | 6 +-
pom.xml | 48 +-
server/pom.xml | 10 +-
.../resources/conf/iotdb-engine.properties | 32 +-
server/src/assembly/resources/conf/iotdb-env.bat | 4 +-
server/src/assembly/resources/conf/iotdb-env.sh | 4 +-
server/src/assembly/resources/conf/logback.xml | 21 +-
.../java/io/moquette/broker/MQTTConnection.java | 503 ++++++++++++++++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 94 ++++
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 9 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 30 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 8 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 155 +++---
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 8 +-
.../apache/iotdb/db/mqtt/BrokerAuthenticator.java | 48 ++
.../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 90 ++++
.../java/org/apache/iotdb/db/mqtt/Message.java | 39 +-
.../apache/iotdb/db/mqtt/PayloadFormatManager.java | 43 +-
.../org/apache/iotdb/db/mqtt/PayloadFormatter.java | 23 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 110 +++++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 29 +-
.../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 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 3 +
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 2 +-
.../org/apache/iotdb/db/service/JMXService.java | 7 +
.../org/apache/iotdb/db/service/MQTTService.java | 102 ++++
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 31 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 44 +-
.../writelog/recover/TsFileRecoverPerformer.java | 23 +-
.../org.apache.iotdb.db.mqtt.PayloadFormatter | 12 +-
.../conf/adapter/ActiveTimeSeriesCounterTest.java | 10 +-
.../iotdb/db/mqtt/BrokerAuthenticatorTest.java | 24 +-
.../iotdb/db/mqtt/JSONPayloadFormatTest.java | 69 +++
.../iotdb/db/mqtt/PayloadFormatManagerTest.java | 22 +-
.../apache/iotdb/db/mqtt/PublishHandlerTest.java | 59 +++
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
service-rpc/pom.xml | 55 +++
.../org/apache/iotdb/session/pool/SessionPool.java | 14 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 4 +-
site/README-zh.md | 206 ++++++++
site/README.md | 169 ++++++-
site/src/main/.vuepress/components/Home.vue | 21 +-
site/src/main/.vuepress/components/Home_zh.vue | 21 +-
site/src/main/.vuepress/config.js | 39 +-
tsfile/pom.xml | 55 +++
.../iotdb/tsfile/common/conf/TSFileConfig.java | 7 +-
...tion.java => NotCompatibleTsFileException.java} | 4 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 5 +-
.../fileInputFactory/LocalFSInputFactory.java | 4 +-
.../fileOutputFactory/LocalFSOutputFactory.java | 4 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 3 +-
.../read/controller/CachedChunkLoaderImpl.java | 4 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 6 +-
.../read/controller/IChunkMetadataLoader.java | 2 +-
.../iotdb/tsfile/read/expression/IExpression.java | 4 +-
.../tsfile/read/expression/QueryExpression.java | 3 +-
.../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 +-
...faultTsFileInput.java => LocalTsFileInput.java} | 4 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../read/reader/series/FileSeriesReader.java | 2 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../write/writer/ForceAppendTsFileWriter.java | 2 +-
...ultTsFileOutput.java => LocalTsFileOutput.java} | 11 +-
.../write/writer/RestorableTsFileIOWriter.java | 15 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 28 +-
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 30 +-
...BatchReader.java => FakedMultiBatchReader.java} | 41 +-
.../tsfile/read/reader/FakedTimeGenerator.java | 73 +++
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 3 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 6 +-
tsfile/src/test/resources/logback.xml | 12 +-
178 files changed, 5371 insertions(+), 1647 deletions(-)
create mode 100644 README_ZH.md
create mode 100644 docs/SystemDesign/5-DataQuery/8-ModificationHandle.md
delete mode 100644 docs/SystemDesign/release.adoc
delete mode 100644 docs/UserGuide/2-Concept/.~2-Data Type.md
create mode 100644 docs/UserGuide/4-Client/6-Programming - MQTT.md
rename docs/UserGuide/4-Client/{6-Status Codes.md => 7-Status Codes.md} (100%)
copy docs/UserGuide/{3-Server/2-Single Node Setup.md => UserGuideReadme.md} (61%)
create mode 100644 docs/zh/SystemDesign/5-DataQuery/8-ModificationHandle.md
delete mode 100644 docs/zh/UserGuide/README.md
copy docs/{UserGuide/3-Server/2-Single Node Setup.md => zh/UserGuide/UserGuideReadme.md} (62%)
create mode 100644 example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSource.java
create mode 100644 example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSource.java
create mode 100644 example/flink/src/main/java/org/apache/iotdb/flink/TsFlieUtils.java
copy example/{tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java => hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileWriteToHDFS.java} (56%)
copy example/{flink => mqtt}/README.md (69%)
copy example/{tsfile => mqtt}/pom.xml (86%)
create mode 100644 example/mqtt/src/main/java/org/apache/iotdb/mqtt/MQTTClient.java
create mode 100644 flink-tsfile-connector/README.md
copy {example/flink => flink-tsfile-connector}/pom.xml (73%)
create mode 100644 flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/RowRecordParser.java
create mode 100644 flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/RowRowRecordParser.java
create mode 100644 flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
create mode 100644 flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
create mode 100644 flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatITCase.java
create mode 100644 flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatTest.java
create mode 100644 flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatTestBase.java
create mode 100644 flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
create mode 100644 flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
create mode 100644 jdbc/osgi.bnd
create mode 100644 jdbc/src/main/feature/feature.xml
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/Activator.java
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDbDataSourceFactory.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java => jdbc/src/main/resources/services/META-INF/java.sql.Driver (90%)
create mode 100644 server/src/main/java/io/moquette/broker/MQTTConnection.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mqtt/JSONPayloadFormatter.java
copy flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/Event.java => server/src/main/java/org/apache/iotdb/db/mqtt/Message.java (68%)
copy flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/Event.java => server/src/main/java/org/apache/iotdb/db/mqtt/PayloadFormatManager.java (51%)
copy flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTSerializationSchema.java => server/src/main/java/org/apache/iotdb/db/mqtt/PayloadFormatter.java (66%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mqtt/PublishHandler.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
copy .asf.yaml => server/src/main/resources/META-INF/services/org.apache.iotdb.db.mqtt.PayloadFormatter (81%)
copy flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTSerializationSchema.java => server/src/test/java/org/apache/iotdb/db/mqtt/BrokerAuthenticatorTest.java (57%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/mqtt/JSONPayloadFormatTest.java
copy flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTSerializationSchema.java => server/src/test/java/org/apache/iotdb/db/mqtt/PayloadFormatManagerTest.java (66%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/mqtt/PublishHandlerTest.java
create mode 100644 site/README-zh.md
rename tsfile/src/main/java/org/apache/iotdb/tsfile/exception/{NotCompatibleException.java => NotCompatibleTsFileException.java} (87%)
rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/{DefaultTsFileInput.java => LocalTsFileInput.java} (95%)
rename tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/{DefaultTsFileOutput.java => LocalTsFileOutput.java} (85%)
copy tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/{FakedBatchReader.java => FakedMultiBatchReader.java} (59%)
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedTimeGenerator.java