[flink] branch master updated (c0684b2 -> e2deb92)

[dw...@apache.org]

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

dwysakowicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from c0684b2  [FLINK-12250] Rewrite assembleNewPartPath to let it return a new PartPath
     add e2deb92  [FLINK-19165] Refactor the UnilateralSortMerger

No new revisions were added by this update.

Summary of changes:
 .../apache/flink/runtime/operators/BatchTask.java  |   41 +-
 .../flink/runtime/operators/DataSinkTask.java      |   24 +-
 .../{Sorter.java => ChannelWithBlockCount.java}    |   28 +-
 .../runtime/operators/sort/CircularElement.java    |   89 +
 .../runtime/operators/sort/CircularQueues.java     |  101 ++
 .../operators/sort/CombineValueIterator.java       |  116 ++
 .../operators/sort/CombiningSpillingBehaviour.java |  157 ++
 .../sort/CombiningUnilateralSortMerger.java        |  638 -------
 .../sort/DefaultInMemorySorterFactory.java         |   17 +-
 .../operators/sort/DefaultSpillingBehaviour.java   |   66 +
 .../runtime/operators/sort/ExternalSorter.java     |  272 +++
 .../operators/sort/ExternalSorterBuilder.java      |  419 +++++
 .../runtime/operators/sort/LargeRecordHandler.java |   63 +-
 .../sort/{Sorter.java => PushSorter.java}          |   21 +-
 .../runtime/operators/sort/ReadingThread.java      |   76 +
 .../flink/runtime/operators/sort/Sorter.java       |    6 +-
 .../runtime/operators/sort/SorterInputGateway.java |  136 ++
 .../runtime/operators/sort/SortingThread.java      |   86 +
 .../operators/sort/SpillChannelManager.java        |  116 ++
 .../runtime/operators/sort/SpillingThread.java     |  573 +++++++
 .../flink/runtime/operators/sort/StageRunner.java  |   73 +
 .../flink/runtime/operators/sort/ThreadBase.java   |  137 ++
 .../operators/sort/UnilateralSortMerger.java       | 1765 --------------------
 .../runtime/operators/sort/WriterCollector.java    |   56 +
 .../operators/util/CloseableInputProvider.java     |    2 +-
 .../operators/ReduceTaskExternalITCase.java        |   53 +-
 .../flink/runtime/operators/ReduceTaskTest.java    |   28 +-
 ...ase.java => CombiningExternalSorterITCase.java} |   89 +-
 .../runtime/operators/sort/ExternalSortITCase.java |   86 +-
 .../sort/ExternalSortLargeRecordsITCase.java       |   96 +-
 ...SortMergerTest.java => ExternalSorterTest.java} |  114 +-
 .../testutils/BinaryOperatorTestBase.java          |   36 +-
 .../operators/testutils/DriverTestBase.java        |   31 +-
 .../operators/testutils/UnaryOperatorTestBase.java |   35 +-
 .../operators/util/HashVsSortMiniBenchmark.java    |   55 +-
 .../flink/test/manual/MassiveStringSorting.java    |   40 +-
 .../test/manual/MassiveStringValueSorting.java     |   40 +-
 .../manual/MassiveCaseClassSortingITCase.scala     |   30 +-
 38 files changed, 3115 insertions(+), 2696 deletions(-)
 copy flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/{Sorter.java => ChannelWithBlockCount.java} (66%)
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CircularElement.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CircularQueues.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombineValueIterator.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningSpillingBehaviour.java
 delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultSpillingBehaviour.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorter.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorterBuilder.java
 copy flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/{Sorter.java => PushSorter.java} (66%)
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReadingThread.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SorterInputGateway.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SortingThread.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillChannelManager.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillingThread.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/StageRunner.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ThreadBase.java
 delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/WriterCollector.java
 rename flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/{CombiningUnilateralSortMergerITCase.java => CombiningExternalSorterITCase.java} (86%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/{UnilateralSortMergerTest.java => ExternalSorterTest.java} (61%)