You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/08/25 09:17:04 UTC

[incubator-iotdb] branch mem_control updated (eb24177 -> 7e94aef)

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

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


    from eb24177  Merge pull request #1615 from apache/remove_dynamic_adapter
     add 72aa40c  [IOTDB-835] Fix delete timeseries and change data type then write failed (#1625)
     add d674035  [hotfix] Delete useless code in Jenkinsfile
     add 5709256  add a data migration example (#1601)
     add 571b7f5  [IOTDB-841] Unify the IOTDBConfig with iotdb-engine.cofig (#1629)
     add 379a7df  disable vm (#1643)
     add f0b8a4b  [IOTDB-836] Fix merging statistics failed when endFile (#1637)
     add 6ef6646  add Delete Storage Group statement to User Guide DDL (#1644)
     add e502a4a  change prepared statement log level from info to debug (#1649)
     add 7e94aef  Merge branch 'master' into mem_control

No new revisions were added by this update.

Summary of changes:
 Jenkinsfile                                        |  37 +----
 .../DDL Data Definition Language.md                |   9 +
 .../DDL Data Definition Language.md                |   9 +
 .../zh/UserGuide/Operation Manual/SQL Reference.md |   2 +-
 .../org/apache/iotdb/DataMigrationExample.java     | 185 +++++++++++++++++++++
 .../apache/iotdb/jdbc/IoTDBPreparedStatement.java  |   6 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  32 ++--
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  13 ++
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   5 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  18 +-
 .../writelog/recover/TsFileRecoverPerformer.java   |   5 +
 .../db/integration/IoTDBDeleteTimeseriesIT.java    | 118 +++++++++++++
 .../db/sync/receiver/load/FileLoaderTest.java      |  23 ++-
 .../recover/SyncReceiverLogAnalyzerTest.java       |  24 ++-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |   5 +-
 15 files changed, 402 insertions(+), 89 deletions(-)
 create mode 100644 example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java