This is an automated email from the ASF dual-hosted git repository.

suyue pushed a change to branch matadata_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 5c90550  merge
     add dbdfc04  modify pr review
     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 24b981e  remove System.out.println() to reduce output on console.
     add adff742  Merge pull request #284 from apache/remove_system.out_in_tests
     add 4b1c927  TsFile Docs Update for the hierarchy of TsFile (#288)
     add 3c565fc  merge master

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 +
 .../UserGuide/7-TsFile/3-Hierarchy.md              | 241 ++++++++++++++++++
 docs/Documentation/UserGuideV0.7.0/0-Content.md    |   5 +-
 .../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     |   3 +
 .../UserGuideV0.7.0/7-TsFile/2-Usage.md            |   5 +
 .../{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 --
 .../apache/iotdb/cli/client/AbstractClientIT.java  |   6 +-
 .../iotdb/cli/client/StartClientScriptIT.java      |   1 -
 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  |   4 +-
 .../iotdb/db/conf/adapter/CompressionRatio.java    |  12 +-
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |  62 ++---
 .../iotdb/db/cost/statistic/Measurement.java       |   2 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |   2 +-
 .../iotdb/db/engine/cache/DeviceMetaDataCache.java |   2 +-
 .../iotdb/db/engine/cache/TsFileMetadataUtils.java |   2 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  48 ----
 .../iotdb/db/engine/memtable/ChunkBufferPool.java  |   6 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  30 ++-
 .../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/SeqResourceIterateReader.java  |   4 +-
 .../SeqResourceReaderByTimestamp.java              |   4 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |   7 +-
 .../UnseqResourceReaderByTimestamp.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     |  12 +-
 .../iotdb/db/engine/memtable/MemTablePoolTest.java |   5 +-
 .../storagegroup/StorageGroupProcessorTest.java    |   1 -
 .../iotdb/db/exception/ExceptionBuilderTest.java   | 103 --------
 .../apache/iotdb/db/integration/IOTDBFillIT.java   |   7 -
 .../iotdb/db/integration/IOTDBGroupByIT.java       |   6 -
 .../integration/IoTDBAggregationLargeDataIT.java   |   5 -
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |  18 +-
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |   4 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |   8 +-
 .../iotdb/db/metadata/MManagerImproveTest.java     |  25 +-
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |   1 -
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |   1 -
 .../iotdb/db/writelog/IoTDBLogFileSizeTest.java    |  10 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |   2 +-
 jdbc/README.md                                     | 158 ++++++------
 pom.xml                                            |   6 +
 .../apache/iotdb/tsfile/compress/SnappyTest.java   |   1 -
 .../delta/DeltaBinaryEncoderIntegerTest.java       |   9 +-
 .../apache/iotdb/tsfile/utils/BytesUtilsTest.java  |   1 -
 .../org/apache/iotdb/tsfile/write/WriteTest.java   |   1 -
 122 files changed, 1462 insertions(+), 1349 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/UserGuide/7-TsFile/3-Hierarchy.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

Reply via email to