You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/22 07:26:43 UTC
[incubator-iotdb] branch dev_merge updated (d4dd3e8 -> 8cd144f)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d4dd3e8 add documents reduce unneeded parameters
add a1b906d TsFile Docs (#247)
add cbe148e change mult_dir_strategy to multi_dir_strategy
add f3f4099 fix sonars and add memory estimation method
add 5da0cf7 add memory tool shell script
add 9813bb0 add sync CHN docu and memory tool docu
add b196596 merge master
add 629b6dc Modifying the assignment process of memTableSize
add 226371c Merge pull request #256 from apache/dev_memory_estimate_tool
add dfbd9dd Windows should use different mvn command, like using quoting '-Dmaven.test.skip=true'
add 4c10597 Merge pull request #267 from Genius-pig/master
add e8c9236 Update readme.md and readme_zh.md in incubator-iotdb/grafana
add 348a86d Merge pull request #268 from samperson1997/grafana_doc
add 5b4f35e [IOTDB-127] Fix Chinese version documents problems
add 41559d4 Delete "Data update" part in Chapter 3.5
add f5c9a92 Fix some detailed problems in English documents
add a95557b Updated 0-content.md for new chapters, and fix some spelling errors
add cced269 Merge pull request #265 from samperson1997/fix_chinese_doc
add 8792645 update jdbc doc
add b4b8f7d update jdbc doc
add 01f6f62 update jdbc doc
add 0b40b50 Merge pull request #269 from 1160300922/update_jdbc_doc
add dcd7c35 [IOTDB-127] Update some execution result pictures in documents
add 0ae5fcd Merge pull request #271 from samperson1997/update_picture
add 49cd042 refactor folder (#270)
add 77010bb remove unused exception
add 38a2943 remove error_info properties
add 4c96985 modify compression ratio
add 05d28cf Merge branch 'reimpl_sync' into remove_unused_exception
add 26cecb6 Merge pull request #272 from apache/remove_unused_exception
add 250dc0b replace two methods with constant value for readability
add 85b0b86 accelerate cal mem
add 60ab6dc format annotation
add edb150c fix win-oraclejdk8 travis
add 8cd144f Merge branch 'master' into dev_merge
No new revisions were added by this update.
Summary of changes:
.travis.yml | 2 +-
.../Frequently asked questions.md | 2 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 2 +-
.../1-Key Concepts and Terminology.md | 12 +-
.../2-Data Type.md | 2 +-
.../3-Operation Manual/2-Data Model Selection.md | 8 +-
.../3-Operation Manual/3-Data Import.md | 2 +-
.../3-Operation Manual/4-Data Query.md | 23 +-
.../3-Operation Manual/5-Data Maintenance.md | 11 +-
.../3-Operation Manual/6-Priviledge Management.md | 2 +-
.../4-Deployment and Management/1-Deployment.md | 34 ++
.../4-Deployment and Management/2-Configuration.md | 148 +-----
.../3-System Monitor.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/QuickStart.md | 6 +
docs/Documentation/UserGuideV0.7.0/0-Content.md | 8 +-
.../1-Key Concepts and Terminology.md | 10 +-
.../2-Data Type.md | 2 +-
.../3-Operation Manual/2-Data Model Selection.md | 9 +-
.../3-Operation Manual/3-Data Import.md | 2 +-
.../3-Operation Manual/4-Data Query.md | 19 +-
.../3-Operation Manual/5-Data Maintenance.md | 10 +-
.../3-Operation Manual/6-Priviledge Management.md | 2 +-
.../4-Deployment and Management/1-Deployment.md | 2 +-
.../4-Deployment and Management/2-Configuration.md | 8 +-
.../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} | 0
grafana/readme.md | 6 +-
grafana/readme_zh.md | 4 +-
iotdb-cli/cli/bin/run-client.bat | 20 -
iotdb/iotdb/conf/error_info_cn.properties | 28 --
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 +-
.../start-sync-client.sh => tools/memory-tool.sh} | 25 +-
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 | 4 +
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 1 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../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 | 108 -----
.../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 | 4 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 7 -
.../apache/iotdb/db/tools/MemEst/MemEstTool.java | 86 ++++
.../iotdb/db/tools/MemEst/MemEstToolCmd.java | 119 +++++
.../java/org/apache/iotdb/db/tools/WalChecker.java | 1 -
.../writelog/recover/TsFileRecoverPerformer.java | 5 +-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 2 +-
.../iotdb/db/exception/ExceptionBuilderTest.java | 103 ----
jdbc/README.md | 158 +++---
pom.xml | 6 +
tsfile/example/readme.md | 15 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 86 ++--
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 233 +++------
.../apache/iotdb/tsfile/write/TsFileWriter.java | 5 -
.../iotdb/tsfile/write/schema/FileSchema.java | 17 -
.../iotdb/tsfile/write/schema/JsonConverter.java | 203 --------
.../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 --
110 files changed, 1974 insertions(+), 2105 deletions(-)
copy docs/Documentation-CHN/{Frequently asked questions.md => UserGuideV0.7.0/7-TsFile/1-Installation.md} (96%)
copy docs/Documentation-CHN/{Frequently asked questions.md => UserGuideV0.7.0/7-TsFile/2-Usage.md} (96%)
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/8-System Tools/1-Sync.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/8-System Tools/2-Memory Estimation Tool.md
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Cli.md => 8-Tools-Cli.md} (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Grafana.md => 8-Tools-Grafana.md} (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} (98%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-spark.md => 8-Tools-spark.md} (98%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/7-TsFile/1-Installation.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/7-TsFile/2-Usage.md
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Sync.md => 8-System Tools/1-Sync.md} (90%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/8-System Tools/2-Memory Estimation Tool.md
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Cli.md => 8-Tools-Cli.md} (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Grafana.md => 8-Tools-Grafana.md} (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} (98%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-spark.md => 8-Tools-spark.md} (100%)
delete mode 100755 iotdb-cli/cli/bin/run-client.bat
delete mode 100644 iotdb/iotdb/conf/error_info_cn.properties
delete mode 100644 iotdb/iotdb/conf/error_info_en.properties
copy docs/Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md => iotdb/iotdb/conf/logback-tool.xml (93%)
rename iotdb/iotdb/{bin => sbin}/start-server.bat (94%)
rename iotdb/iotdb/{bin => sbin}/start-server.sh (100%)
rename iotdb/iotdb/{bin => sbin}/stop-server.bat (100%)
rename iotdb/iotdb/{bin => sbin}/stop-server.sh (100%)
copy iotdb/iotdb/{bin/start-sync-client.bat => tools/memory-tool.bat} (72%)
copy iotdb/iotdb/{bin/start-sync-client.sh => tools/memory-tool.sh} (72%)
rename iotdb/iotdb/{bin => tools}/start-WalChecker.bat (100%)
rename iotdb/iotdb/{bin => tools}/start-WalChecker.sh (100%)
rename iotdb/iotdb/{bin => tools}/start-sync-client.bat (90%)
rename iotdb/iotdb/{bin => tools}/start-sync-client.sh (100%)
rename iotdb/iotdb/{bin => tools}/stop-sync-client.bat (100%)
rename iotdb/iotdb/{bin => tools}/stop-sync-client.sh (100%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/ErrorDebugException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedOverflowOpTypeException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/WALOverSizedException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/AuthPluginException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionFailedException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionHostException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InsecureAPIException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InvalidParameterException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/IoTDBException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoParameterException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoPreparedStatementException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/OutOfMemoryException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/UnknownException.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/exception/qp/GeneratePhysicalPlanException.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
delete mode 100644 iotdb/src/test/java/org/apache/iotdb/db/exception/ExceptionBuilderTest.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
delete mode 100755 tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
delete mode 100644 tsfile/src/test/resources/test_schema.json
delete mode 100644 tsfile/src/test/resources/test_write_schema.json