This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch fix_concurrent_error
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 7c134c0 copy when read
add d384cb5 add rpc compression api in client and session module (#930)
add 94411e0 Delete dataTypeMapping etc fields in QueryPlan (#934)
add 8b8d4c3 Fix Travis issues about timeout and the socket problem in the
Sync module (#940)
add c33ce16 Merge remote-tracking branch 'origin/master' into
fix_concurrent_error
No new revisions were added by this update.
Summary of changes:
.travis.yml | 2 +-
.../org/apache/iotdb/client/AbstractClient.java | 21 ++++---
.../main/java/org/apache/iotdb/client/Client.java | 3 +
.../java/org/apache/iotdb/client/WinClient.java | 3 +
.../main/java/org/apache/iotdb/SessionExample.java | 20 ++++---
.../main/java/org/apache/iotdb/jdbc/Config.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 12 ++--
.../iotdb/db/qp/physical/crud/QueryPlan.java | 11 ----
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 65 ++++++++--------------
.../db/query/dataset/AlignByDeviceDataSet.java | 53 ++++++++++--------
.../iotdb/db/sync/receiver/SyncServerManager.java | 36 +++++++++++-
.../thrift/SyncServiceEventHandler.java} | 29 +++++-----
.../java/org/apache/iotdb/session/Session.java | 33 ++++++-----
13 files changed, 158 insertions(+), 132 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/{service/JDBCServiceEventHandler.java
=> sync/thrift/SyncServiceEventHandler.java} (65%)
