You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/06/18 07:30:58 UTC
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into download_links
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch download_links
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d83b0b1c4778b1e972533ef96e3a1be278664924
Merge: c0f3698 b47f96d
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Jun 18 15:29:53 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into download_links
.../iotdb/cluster/query/LocalQueryExecutor.java | 18 ++---
.../cluster/query/reader/ClusterReaderFactory.java | 23 +++---
.../cluster/query/reader/ClusterTimeGenerator.java | 45 +++++++----
.../apache/iotdb/cluster/query/BaseQueryTest.java | 4 +-
.../query/ClusterDataQueryExecutorTest.java | 6 +-
.../query/reader/ClusterReaderFactoryTest.java | 82 +++++++++++++++++++++
.../query/reader/ClusterTimeGeneratorTest.java | 58 +++++++++++++++
.../iotdb/cluster/server/member/BaseMember.java | 2 +-
example/client-cpp-example/src/SessionExample.cpp | 2 +
.../reader/series/SeriesRawDataBatchReader.java | 5 ++
.../iotdb/db/query/reader/series/SeriesReader.java | 5 ++
.../reader/universal/PriorityMergeReader.java | 1 +
.../query/timegenerator/ServerTimeGenerator.java | 2 +-
.../.vuepress/public/img/contributor-avatar/cw.jpg | Bin 0 -> 163226 bytes
.../theme/global-components/Contributor.vue | 2 +-
15 files changed, 208 insertions(+), 47 deletions(-)