[iotdb] 04/04: fix review

[ha...@apache.org]

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

haonan pushed a commit to branch mem_control_op
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 313eb0c0e126f93dd39eac7893998642545abbb8
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 26 23:52:59 2020 +0800

    fix review
---
 server/src/assembly/resources/conf/iotdb-engine.properties  | 13 +++++--------
 .../iotdb/db/engine/storagegroup/TsFileProcessor.java       |  9 ++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index fe5f7bb..af7938c 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -174,7 +174,7 @@ timestamp_precision=ms
 wal_buffer_size=16777216
 
 # When a TsFile's file size (in byte) exceeds this, the TsFile is forced closed.
-# It may cause memTable size smaller, if it sets a large value
+# It may cause memTable size smaller if it is a large value
 tsfile_size_threshold=1
 
 # When a memTable's size (in byte) exceeds this, the memtable is flushed to disk. The default threshold is 1 GB.
@@ -232,15 +232,14 @@ write_read_schema_free_memory_proportion=4:3:1:2
 primitive_array_size=128
 
 # Ratio of write memory for invoking flush disk, 0.4 by default
-# If you have extremely high level of writing pressure (like batch=1000) and the physical memory size is large enough, 
-# it can be set lower than the default value like 0.2
+# If you have extremely high write load (like batch=1000), it can be set lower than the default value like 0.2
 flush_proportion=0.4
 
 # Ratio of write memory allocated for buffered arrays, 0.6 by default
 buffered_arrays_memory_proportion=0.6
 
 # Ratio of write memory for rejecting insertion, 0.8 by default
-# If you have extremely high level of writing pressure (like batch=1000) and the physical memory size is large enough, 
+# If you have extremely high write load (like batch=1000) and the physical memory size is large enough, 
 # it can be set higher than the default value like 0.9
 reject_proportion=0.8
 
@@ -252,13 +251,11 @@ storage_group_report_threshold=16777216
 max_deduplicated_path_num=1000
 
 # When an inserting is rejected, waiting time (in ms) to check system again, 0 by default.
-# If you have high level of writing pressure and low level of reading pressure,
-# it can be set larger than 0, like 10. 
+# If the insertion has been rejected and the read load is low, it can be set larger than 0, like 10. 
 waiting_time_when_insert_blocked=0
 
 # When the waiting time (in ms) of an inserting exceeds this, throw an exception. 0 by default.
-# If you have high level of writing pressure and low level of reading pressure,
-# it can be set larger than 0, like 10000. 
+# If the insertion has been rejected and the read load is low, it can be set larger than 0, like 10000. 
 max_waiting_time_when_insert_blocked=0
 
 # estimated metadata size (in byte) of one timeseries in Mtree
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index b6e217b..169ed5c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -172,8 +172,7 @@ public class TsFileProcessor {
    *
    * @param insertRowPlan physical plan of insertion
    */
-  public void insert(InsertRowPlan insertRowPlan) 
-      throws WriteProcessException, WriteProcessRejectException {
+  public void insert(InsertRowPlan insertRowPlan) throws WriteProcessException {
 
     if (workMemTable == null) {
       workMemTable = new PrimitiveMemTable(enableMemControl);
@@ -216,7 +215,7 @@ public class TsFileProcessor {
    * @param results result array
    */
   public void insertTablet(InsertTabletPlan insertTabletPlan, int start, int end,
-      TSStatus[] results) throws WriteProcessException, WriteProcessRejectException {
+      TSStatus[] results) throws WriteProcessException {
 
     if (workMemTable == null) {
       workMemTable = new PrimitiveMemTable(enableMemControl);
@@ -257,7 +256,7 @@ public class TsFileProcessor {
   }
 
   private void checkMemCostAndAddToTspInfo(InsertRowPlan insertRowPlan) 
-      throws WriteProcessException, WriteProcessRejectException {
+      throws WriteProcessException {
     // memory of increased PrimitiveArray and TEXT values, e.g., add a long[128], add 128*8
     long memTableIncrement = 0L;
     long textDataIncrement = 0L;
@@ -307,7 +306,7 @@ public class TsFileProcessor {
   }
 
   private void checkMemCostAndAddToTspInfo(InsertTabletPlan insertTabletPlan, int start, int end)
-      throws WriteProcessException, WriteProcessRejectException {
+      throws WriteProcessException {
     if (start >= end) {
       return;
     }