[iotdb] branch virtual_partition_2_merge updated (1ad5655 -> 4c261f0)

[xu...@apache.org]

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

xuekaifeng pushed a change to branch virtual_partition_2_merge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 1ad5655  fix test
     add 6cb930d  Remove useless imports in python client (#2210)
     add 6fa424c  add 0.11 file check (#2225)
     new 4c261f0  Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 client-py/src/iotdb/Session.py                         |  1 -
 client-py/src/iotdb/utils/RowRecord.py                 |  1 -
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java     | 18 +++++++-----------
 .../apache/iotdb/db/integration/IoTDBCompleteIT.java   |  3 ++-
 4 files changed, 9 insertions(+), 14 deletions(-)

[iotdb] 01/01: Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge

[xu...@apache.org]

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

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

commit 4c261f0381aae32c634acd14a965e01e408f0a22
Merge: 1ad5655 6fa424c
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Dec 9 20:36:57 2020 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge

 client-py/src/iotdb/Session.py                         |  1 -
 client-py/src/iotdb/utils/RowRecord.py                 |  1 -
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java     | 18 +++++++-----------
 .../apache/iotdb/db/integration/IoTDBCompleteIT.java   |  3 ++-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --cc server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
index 72a7753,f53b3f2..2b18511
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
@@@ -38,7 -36,6 +38,8 @@@ public class IoTDBCompleteIT 
  
    @Before
    public void setUp() throws Exception {
-     HashVirtualPartitioner.getInstance().setStorageGroupNum(1);
++    // test different partition
++    HashVirtualPartitioner.getInstance().setStorageGroupNum(16);
      EnvironmentUtils.closeStatMonitor();
      EnvironmentUtils.envSetUp();
    }