You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2021/01/22 03:44:57 UTC

[iotdb] branch fix_merge_bug_v2 updated (f45fa9b -> 9bcaf4c)

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

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


 discard f45fa9b  simplify travis
     add adb5ea8  Support brackets with number in timeseries path (#2503)
     add 56a2353  first chunkmetadata should be consumed first (#2547)
     add 8610954  Add a specification of the character that supported in time series name (#2501)
     add 6953b9e  [IOTDB-1077] Add python test and insert one device interface (#2539)
     add 32d91c1  Use FileOutputStream instead of FileChannel to avoid a potential resource leak in synchronous service (#2408)
     add 7416dcf  [ISSUE-2545, 2549] Fix unseq merge end time bug (#2544)
     add 2b83c35  disable travis (#2551)
     add 4f8c41f  Change "Not support" to "Does not support" in error message of IOTDBConnection.java (#2281)
     add 56b215c  Optimize enum class and change some java practice (#2435)
     add f44d8b9  [IOTDB-1055] Support data compression type GZIP (#2264)
     add af20b89  [Distributed] fix session cache leader interface and docs  (#2222)
     add 7aa0fe0  Merge branch 'master' of github.com:apache/iotdb
     add 9bcaf4c  Merge branch 'master' into fix_merge_bug_v2

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f45fa9b)
            \
             N -- N -- N   refs/heads/fix_merge_bug_v2 (9bcaf4c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        | 192 -----
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |   5 +-
 client-py/readme.md                                |   6 +
 client-py/src/SessionExample.py                    |  14 +-
 .../src/{SessionExample.py => SessionTest.py}      |  79 ++-
 client-py/src/iotdb/Session.py                     | 143 +++-
 client-py/src/iotdb/utils/IoTDBRpcDataSet.py       |   5 +-
 .../iotdb/cluster/partition/PartitionTable.java    |   3 +-
 docs/UserGuide/Client/Programming - Native API.md  |   8 +
 .../Concept/Data Model and Terminology.md          |  15 +-
 .../DDL Data Definition Language.md                |   3 +
 docs/UserGuide/Server/Cluster Setup.md             |   3 -
 .../UserGuide/Client/Programming - Native API.md   |  10 +-
 .../Concept/Data Model and Terminology.md          |  16 +-
 .../DDL Data Definition Language.md                |   4 +
 docs/zh/UserGuide/Server/Cluster Setup.md          |   3 -
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |  60 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  34 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  18 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  15 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |   8 +-
 .../apache/iotdb/db/rescon/MemTableManager.java    |  39 +-
 .../iotdb/db/rescon/PrimitiveArrayManager.java     |   2 +-
 .../apache/iotdb/db/rescon/TVListAllocator.java    |  14 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  11 +-
 .../db/sync/receiver/transfer/SyncServiceImpl.java |  18 +-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  66 +-
 .../iotdb/db/integration/IoTDBCompressTypeIT.java  | 101 +++
 .../iotdb/db/integration/IoTDBMergeTest.java       |  51 +-
 .../iotdb/db/qp/physical/PhysicalPlanTest.java     |   3 +-
 .../main/java/org/apache/iotdb/session/Config.java |   2 +-
 .../java/org/apache/iotdb/session/Session.java     |  79 ++-
 .../apache/iotdb/session/SessionConnection.java    |   4 +
 .../org/apache/iotdb/session/pool/SessionPool.java |  52 +-
 .../apache/iotdb/session/SessionCacheLeaderUT.java | 769 +++++++++++++++++++++
 .../apache/iotdb/session/pool/SessionPoolTest.java |   8 +-
 .../apache/iotdb/tsfile/compress/ICompressor.java  |  83 ++-
 .../iotdb/tsfile/compress/IUnCompressor.java       |  50 ++
 .../compress/{SnappyTest.java => GZIPTest.java}    |  66 +-
 40 files changed, 1607 insertions(+), 457 deletions(-)
 delete mode 100644 .travis.yml
 copy client-py/src/{SessionExample.py => SessionTest.py} (61%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompressTypeIT.java
 create mode 100644 session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
 copy tsfile/src/test/java/org/apache/iotdb/tsfile/compress/{SnappyTest.java => GZIPTest.java} (57%)