[incubator-iotdb] 01/02: merge with master

[hxd]

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

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

commit 2a434dd01021f780b3316880770835b4ba030ee0
Merge: 5cde236 e502f5d
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Tue Feb 18 14:02:17 2020 +0800

    merge with master

 .asf.yaml                                          |  30 ++
 README.md                                          |   1 +
 .../org/apache/iotdb/client/AbstractClient.java    | 484 +++++++--------------
 .../main/java/org/apache/iotdb/client/Client.java  |  32 +-
 .../java/org/apache/iotdb/client/WinClient.java    |  31 +-
 .../SystemDesign/6-Tools/1-Sync.md                 | 279 +++++++++++-
 .../2-DML (Data Manipulation Language).md          |   6 +-
 example/rocketmq/readme.md                         |   4 +-
 .../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java    |   8 +-
 .../src/main/java/org/apache/iotdb/jdbc/Utils.java |   7 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   2 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  15 +
 .../engine/storagegroup/StorageGroupProcessor.java |  26 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |  13 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   2 +-
 .../db/query/dataset/DeviceIterateDataSet.java     |  15 +-
 .../NewEngineDataSetWithoutValueFilter.java        |   8 +-
 .../SeriesReaderWithoutValueFilter.java            |  15 +-
 .../iotdb/db/sync/sender/transfer/SyncClient.java  |   9 +-
 .../org/apache/iotdb/db/utils/UpgradeUtils.java    |   6 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |   1 +
 .../db/integration/IoTDBDeleteStorageGroupIT.java  |  33 +-
 .../iotdb/db/integration/IoTDBDisableAlignIT.java  |   1 -
 .../iotdb/db/integration/IoTDBQueryDemoIT.java     |  14 +-
 .../iotdb/db/integration/IoTDBRecoverIT.java       |  16 +-
 25 files changed, 590 insertions(+), 468 deletions(-)

diff --cc 
server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
index a06a0cc,2ec2bdd..4c3a2ec
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
@@@ -82,8 -81,7 +81,8 @@@ public class IoTDBRecoverIT 
    @Before
    public void setUp() throws Exception {
      EnvironmentUtils.closeStatMonitor();
-     daemon = IoTDB.getInstance();
-     EnvironmentUtils.envSetUp(daemon);
++
+     EnvironmentUtils.envSetUp();
      Class.forName(Config.JDBC_DRIVER_NAME);
      prepareData();
    }
@@@ -216,8 -213,7 +214,8 @@@
      } catch (InterruptedException e) {
        e.printStackTrace();
      }
-     daemon.active();
-     //EnvironmentUtils.envSetUp();
++
+     EnvironmentUtils.activeDaemon();
  
      // maxminValueTest