You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/09/30 01:18:32 UTC
[incubator-iotdb] branch master updated (d6e902f -> c7cbfab)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d6e902f [IoTDB-246] Add Chinese version for hadoop-connector doc (#438)
add c7cbfab [ IOTDB-160]External sort (#336)
No new revisions were added by this update.
Summary of changes:
.../resources/conf/iotdb-engine.properties | 13 ++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 47 ++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +-
.../db/query/control/QueryResourceManager.java | 64 ++++---
.../db/query/externalsort/ExternalSortJob.java | 51 +++++
.../query/externalsort/ExternalSortJobEngine.java | 57 ++++++
.../db/query/externalsort/ExternalSortJobPart.java | 44 +++++
.../externalsort/ExternalSortJobScheduler.java | 44 +++++
.../iotdb/db/query/externalsort/LineMerger.java | 56 ++++++
.../MultiSourceExternalSortJobPart.java | 61 ++++++
.../externalsort/SimpleExternalSortEngine.java | 180 ++++++++++++++++++
.../SingleSourceExternalSortJobPart.java | 40 ++++
.../adapter/ByTimestampReaderAdapter.java | 78 ++++++++
.../serialize/IExternalSortFileDeserializer.java | 32 ++++
.../serialize/IExternalSortFileSerializer.java} | 26 ++-
.../FixLengthIExternalSortFileDeserializer.java | 209 +++++++++++++++++++++
.../impl/FixLengthTimeValuePairSerializer.java | 169 +++++++++++++++++
.../query/reader/chunkRelated/ChunkReaderWrap.java | 106 +++++++++++
.../resourceRelated/UnseqResourceMergeReader.java | 37 ++--
.../UnseqResourceReaderByTimestamp.java | 39 ++--
.../reader/universal/PriorityMergeReader.java | 16 +-
.../query/externalsort/ExternalSortEngineTest.java | 189 +++++++++++++++++++
.../query/externalsort/FakeChunkReaderWrap.java} | 31 ++-
...ExternalSortFileSerializerDeserializerTest.java | 129 +++++++++++++
.../query/reader/universal/FakedSeriesReader.java | 88 +++++++++
.../reader/universal/PriorityMergeReaderTest.java | 32 ----
.../reader/universal/PriorityMergeReaderTest2.java | 50 +----
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
28 files changed, 1728 insertions(+), 180 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/adapter/ByTimestampReaderAdapter.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/IExternalSortFileDeserializer.java
copy server/src/main/java/org/apache/iotdb/db/query/{reader/IPointReader.java => externalsort/serialize/IExternalSortFileSerializer.java} (50%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/ChunkReaderWrap.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/externalsort/ExternalSortEngineTest.java
copy server/src/{main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java => test/java/org/apache/iotdb/db/query/externalsort/FakeChunkReaderWrap.java} (60%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/externalsort/IExternalSortFileSerializerDeserializerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReader.java