[incubator-iotdb] 02/02: solving conflicts

[hx...@apache.org]

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

hxd pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 5cc8554b61927e226f6af513564b44db3b8f91aa
Merge: 5e41f43 94ad2c8
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Jun 29 11:54:24 2019 +0800

    solving conflicts

 .../iotdb/db/engine/memtable/AbstractMemTable.java | 14 ++++-----
 .../iotdb/db/engine/memtable/ChunkBufferPool.java  | 15 +---------
 .../iotdb/db/engine/memtable/EmptyMemTable.java    |  2 +-
 .../db/engine/memtable/PrimitiveMemTable.java      |  4 +--
 .../db/utils/datastructure/TVListAllocator.java    | 34 +++++++++++++++++-----
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --cc iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
index e40a7cf,2539187..b481837
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
@@@ -37,20 -36,12 +37,7 @@@ public class ChunkBufferPool 
    private static final Logger LOGGER = LoggerFactory.getLogger(ChunkBufferPool.class);
  
    private static final Deque<ChunkBuffer> availableChunkBuffer = new ArrayDeque<>();
- 
- //  /**
- //   * the number of required FlushTasks is no more than {@linkplain MemTablePool}.
- //   */
- //  private static final int capacity = IoTDBDescriptor.getInstance().getConfig()
- //      .getMemtableNumber();
--
--  /**
-    * The number of chunkBuffer in the pool is less than the memtable number by default.
-    * Once the maximal number of time series is greater than the capacity, the capacity will be updated
-    * to the maximal number.
 -   * the number of required FlushTasks is no more than {@linkplain MemTablePool}.
--   */
-  //private volatile int capacity = IoTDBDescriptor.getInstance().getConfig().getMemtableNumber();
 -  private static final int capacity = 2208000;
--
++  
    private int size = 0;
  
    private static final int WAIT_TIME = 2000;