You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/07/19 13:14:15 UTC
[incubator-iotdb] 01/01: Merge pull request #273 from
apache/merge_master
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 828c4e03e23ef076622e2b3a49a262fc70092e83
Merge: b8fd6a8 9f8c0c3
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Fri Jul 19 21:14:08 2019 +0800
Merge pull request #273 from apache/merge_master
Merge with master
docs/Development.md | 80 +++-
.../Frequently asked questions.md | 2 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 4 +-
.../UserGuideV0.7.0/1-Overview/4-Features.md | 4 +-
.../1-Key Concepts and Terminology.md | 12 +-
.../2-Data Type.md | 12 +-
.../3-Operation Manual/2-Data Model Selection.md | 10 +-
.../3-Operation Manual/3-Data Import.md | 6 +-
.../3-Operation Manual/4-Data Query.md | 33 +-
.../3-Operation Manual/5-Data Maintenance.md | 15 +-
.../3-Operation Manual/6-Priviledge Management.md | 2 +-
.../4-Deployment and Management/1-Deployment.md | 38 +-
.../4-Deployment and Management/2-Configuration.md | 170 +------
.../3-System Monitor.md | 10 +-
.../1-IoTDB Query Statement.md | 2 +-
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md | 2 +-
.../7-TsFile/1-Installation.md} | 4 +-
.../7-TsFile/2-Usage.md} | 4 +-
.../UserGuideV0.7.0/8-System Tools/1-Sync.md | 280 +++++++++++
.../8-System Tools/2-Memory Estimation Tool.md | 90 ++++
.../{7-Tools-Cli.md => 8-Tools-Cli.md} | 0
.../{7-Tools-Grafana.md => 8-Tools-Grafana.md} | 0
.../{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} | 2 +-
.../{7-Tools-spark.md => 8-Tools-spark.md} | 2 +-
docs/Documentation/Frequently asked questions.md | 4 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 6 +-
docs/Documentation/QuickStart.md | 6 +
docs/Documentation/UserGuideV0.7.0/0-Content.md | 15 +-
.../1-Key Concepts and Terminology.md | 10 +-
.../2-Data Type.md | 10 +-
.../3-Operation Manual/2-Data Model Selection.md | 11 +-
.../3-Operation Manual/3-Data Import.md | 8 +-
.../3-Operation Manual/4-Data Query.md | 29 +-
.../3-Operation Manual/5-Data Maintenance.md | 14 +-
.../3-Operation Manual/6-Priviledge Management.md | 2 +-
.../4-Deployment and Management/1-Deployment.md | 6 +-
.../4-Deployment and Management/2-Configuration.md | 26 +-
.../3-System Monitor.md | 8 +-
.../7-Build and use IoTDB by Dockerfile.md | 2 +-
.../1-IoTDB Query Statement.md | 2 +-
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md | 166 ++++++-
.../UserGuideV0.7.0/7-TsFile/1-Installation.md | 96 ++++
.../UserGuideV0.7.0/7-TsFile/2-Usage.md | 530 +++++++++++++++++++++
.../{7-Tools-Sync.md => 8-System Tools/1-Sync.md} | 34 +-
.../8-System Tools/2-Memory Estimation Tool.md | 81 ++++
.../{7-Tools-Cli.md => 8-Tools-Cli.md} | 0
.../{7-Tools-Grafana.md => 8-Tools-Grafana.md} | 0
.../{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} | 2 +-
.../{7-Tools-spark.md => 8-Tools-spark.md} | 6 +-
example/kafka/pom.xml | 4 +-
example/kafka/readme.md | 4 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
example/rocketmq/readme.md | 4 +-
grafana/pom.xml | 4 +-
grafana/readme.md | 6 +-
grafana/readme_zh.md | 4 +-
hadoop/pom.xml | 2 +-
iotdb-cli/cli/bin/run-client.bat | 20 -
iotdb-cli/pom.xml | 4 +-
iotdb/iotdb/conf/error_info_en.properties | 28 --
.../iotdb/conf/logback-tool.xml | 6 +-
iotdb/iotdb/{bin => sbin}/start-server.bat | 4 +-
iotdb/iotdb/{bin => sbin}/start-server.sh | 0
iotdb/iotdb/{bin => sbin}/stop-server.bat | 0
iotdb/iotdb/{bin => sbin}/stop-server.sh | 0
.../memory-tool.bat} | 25 +-
.../memory-tool.sh} | 37 +-
iotdb/iotdb/{bin => tools}/start-WalChecker.bat | 0
iotdb/iotdb/{bin => tools}/start-WalChecker.sh | 0
iotdb/iotdb/{bin => tools}/start-sync-client.bat | 6 +-
iotdb/iotdb/{bin => tools}/start-sync-client.sh | 0
iotdb/iotdb/{bin => tools}/stop-sync-client.bat | 0
iotdb/iotdb/{bin => tools}/stop-sync-client.sh | 0
iotdb/pom.xml | 6 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 1 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 12 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 62 +--
.../iotdb/db/cost/statistic/Measurement.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 48 --
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 6 +-
.../iotdb/db/exception/ErrorDebugException.java | 37 --
.../UnSupportedOverflowOpTypeException.java | 42 --
.../iotdb/db/exception/WALOverSizedException.java | 38 --
.../db/exception/builder/ExceptionBuilder.java | 107 -----
.../exception/codebased/AuthPluginException.java | 33 --
.../codebased/ConnectionFailedException.java | 32 --
.../codebased/ConnectionHostException.java | 33 --
.../exception/codebased/InsecureAPIException.java | 33 --
.../codebased/InvalidParameterException.java | 32 --
.../db/exception/codebased/IoTDBException.java | 49 --
.../exception/codebased/NoParameterException.java | 32 --
.../codebased/NoPreparedStatementException.java | 32 --
.../exception/codebased/OutOfMemoryException.java | 32 --
.../db/exception/codebased/UnknownException.java | 32 --
.../qp/GeneratePhysicalPlanException.java | 34 --
.../org/apache/iotdb/db/metadata/MManager.java | 6 +-
.../resourceRelated/UnseqResourceMergeReader.java | 28 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 7 -
.../apache/iotdb/db/tools/MemEst/MemEstTool.java | 86 ++++
.../iotdb/db/tools/MemEst/MemEstToolCmd.java | 101 ++++
.../java/org/apache/iotdb/db/tools/WalChecker.java | 1 -
.../writelog/recover/TsFileRecoverPerformer.java | 5 +-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 2 +-
.../iotdb/db/exception/ExceptionBuilderTest.java | 102 ----
jdbc/README.md | 159 ++++++-
jdbc/pom.xml | 6 +-
.../main/java/org/apache/iotdb/jdbc/Constant.java | 2 +-
pom.xml | 8 +-
service-rpc/pom.xml | 2 +-
spark/README.md | 6 +-
spark/pom.xml | 2 +-
tsfile/example/readme.md | 17 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 86 ++--
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 233 +++------
tsfile/pom.xml | 2 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 5 -
.../iotdb/tsfile/write/schema/FileSchema.java | 17 -
.../iotdb/tsfile/write/schema/JsonConverter.java | 203 --------
.../apache/iotdb/tsfile/compress/CompressTest.java | 13 +-
.../apache/iotdb/tsfile/compress/SnappyTest.java | 3 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 63 +--
.../apache/iotdb/tsfile/utils/FileGenerator.java | 60 +--
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 52 +-
.../org/apache/iotdb/tsfile/write/PerfTest.java | 38 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 59 +--
.../org/apache/iotdb/tsfile/write/WriteTest.java | 46 +-
.../write/schema/converter/JsonConverterTest.java | 126 -----
tsfile/src/test/resources/test_schema.json | 25 -
tsfile/src/test/resources/test_write_schema.json | 31 --
133 files changed, 2222 insertions(+), 2153 deletions(-)