You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/05/02 06:23:31 UTC
[iotdb] branch clean_package updated (5b9d36bdd3 -> 3c0df44df5)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch clean_package
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 5b9d36bdd3 Merge remote-tracking branch 'origin/master' into clean_package
add 3c0df44df5 resolve conflict
No new revisions were added by this update.
Summary of changes:
.../datatransfer}/LocalSinkHandle.java | 4 ++--
.../datatransfer}/LocalSourceHandle.java | 4 ++--
.../datatransfer}/SharedTsBlockQueue.java | 4 ++--
.../node/metedata/write/CreateTimeSeriesNode.java | 9 ++++----
.../thrift/impl/DataNodeTSIServiceImpl.java | 2 +-
.../datatransfer}/DataBlockManagerTest.java | 8 ++++----
.../datatransfer}/LocalSinkHandleTest.java | 24 ++++++++++++----------
.../datatransfer}/LocalSourceHandleTest.java | 10 ++++-----
.../datatransfer}/SharedTsBlockQueueTest.java | 6 +++---
9 files changed, 37 insertions(+), 34 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/LocalSinkHandle.java (96%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/LocalSourceHandle.java (96%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/SharedTsBlockQueue.java (97%)
rename server/src/test/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/DataBlockManagerTest.java (95%)
rename server/src/test/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/LocalSinkHandleTest.java (90%)
rename server/src/test/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/LocalSourceHandleTest.java (94%)
rename server/src/test/java/org/apache/iotdb/db/mpp/{buffer => execution/datatransfer}/SharedTsBlockQueueTest.java (96%)