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

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


    from f2cfdea  fix concurrent catch up fix queried node registering fix 
exceptions of missing meta during insertion
     add 7a7eb58  fix recover last file bug (#1233)
     add 144320a  [IOTDB-689]add thriftEventHandler to cleanup when a client 
quit (#1231)
     add 637bf1b  Fix incorrect error msg in avg() query
     add 8e9b01f  Merge branch 'master' into cluster_new

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |  2 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  3 ++
 .../db/engine/storagegroup/TsFileResource.java     |  4 ++
 .../db/query/aggregation/impl/AvgAggrResult.java   |  7 +++
 .../org/apache/iotdb/db/service/RPCService.java    |  1 +
 .../iotdb/db/service/RPCServiceThriftHandler.java  | 44 ++++++++---------
 .../iotdb/db/sync/receiver/SyncServerManager.java  |  6 ++-
 .../db/sync/receiver/SyncServerThriftHandler.java  | 57 ++++++++++++++++++++++
 .../db/sync/receiver/transfer/SyncServiceImpl.java |  6 +++
 .../writelog/recover/TsFileRecoverPerformer.java   |  1 -
 .../iotdb/db/integration/IoTDBAggregationIT.java   |  9 ++++
 11 files changed, 112 insertions(+), 28 deletions(-)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/EmptyFileSeriesReader.java
 => 
server/src/main/java/org/apache/iotdb/db/service/RPCServiceThriftHandler.java 
(52%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerThriftHandler.java

Reply via email to