You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/25 05:20:16 UTC
[incubator-iotdb] branch dev_merge updated (6d0ed15 -> 65f9426)

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

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


    from 6d0ed15  fix PriorityMergeReader
     add 65f9426  improve resource control in tests

No new revisions were added by this update.

Summary of changes:
 .../apache/iotdb/cli/client/AbstractClient.java    |  17 +-
 .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java      |  25 +-
 .../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java |  80 +--
 .../org/apache/iotdb/jdbc/IoTDBStatementTest.java  |  11 +-
 .../iotdb/jdbc/demo/PrepareStatementDemo.java      |  38 +-
 .../org/apache/iotdb/jdbc/demo/StatementDemo.java  |  27 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |   3 +-
 .../db/engine/modification/DeletionQueryTest.java  |   4 +-
 .../apache/iotdb/db/integration/IOTDBFillIT.java   | 202 ++++----
 .../iotdb/db/integration/IOTDBGroupByIT.java       | 309 +++++-------
 .../iotdb/db/integration/IoTDBAggregationIT.java   | 462 ++++++++---------
 .../integration/IoTDBAggregationLargeDataIT.java   | 433 ++++++----------
 .../integration/IoTDBAggregationSmallDataIT.java   | 549 +++++++++------------
 .../iotdb/db/integration/IoTDBCompleteIT.java      |  15 +-
 .../apache/iotdb/db/integration/IoTDBDaemonIT.java | 216 ++++----
 .../iotdb/db/integration/IoTDBDeletionIT.java      | 194 ++++----
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  14 +-
 .../db/integration/IoTDBFloatPrecisionIT.java      | 110 ++---
 .../db/integration/IoTDBFlushQueryMergeTest.java   |  42 +-
 .../iotdb/db/integration/IoTDBLargeDataIT.java     | 167 +++----
 .../iotdb/db/integration/IoTDBLimitSlimitIT.java   |  73 ++-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 208 ++++----
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   | 163 +++---
 .../iotdb/db/integration/IoTDBPreparedStmtIT.java  |  58 +--
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  13 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  17 +-
 .../iotdb/db/integration/IoTDBTimeZoneIT.java      |  30 +-
 .../iotdb/db/integration/IoTDBVersionIT.java       |   7 +-
 .../iotdb/db/sync/sender/SingleClientSyncTest.java |  96 ++--
 .../apache/iotdb/db/sync/test/SyncTestClient1.java |  11 +-
 .../iotdb/db/writelog/IoTDBLogFileSizeTest.java    |  59 +--
 31 files changed, 1496 insertions(+), 2157 deletions(-)