-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Flink: Support watermark alignment of source splits
- Loading branch information
Peter Vary
committed
Dec 16, 2023
1 parent
5d0d76f
commit 7534f5a
Showing
4 changed files
with
213 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
...nk/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceSplitReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.iceberg.flink.source.reader; | ||
|
|
||
| import static org.apache.iceberg.types.Types.NestedField.required; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition; | ||
| import org.apache.flink.connector.testutils.source.reader.TestingReaderContext; | ||
| import org.apache.flink.table.data.RowData; | ||
| import org.apache.iceberg.FileFormat; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.data.GenericAppenderFactory; | ||
| import org.apache.iceberg.data.RandomGenericData; | ||
| import org.apache.iceberg.data.Record; | ||
| import org.apache.iceberg.encryption.PlaintextEncryptionManager; | ||
| import org.apache.iceberg.flink.source.split.IcebergSourceSplit; | ||
| import org.apache.iceberg.flink.source.split.SplitComparators; | ||
| import org.apache.iceberg.hadoop.HadoopFileIO; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.awaitility.Awaitility; | ||
| import org.awaitility.core.ConditionTimeoutException; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| public class TestIcebergSourceSplitReader { | ||
| @ClassRule public static final TemporaryFolder TEMPORARY_FOLDER = new TemporaryFolder(); | ||
|
|
||
| private static final Schema SCHEMA = | ||
| new Schema(required(1, "timestamp_column", Types.TimestampType.withoutZone())); | ||
| private static final GenericAppenderFactory APPENDER_FACTORY = new GenericAppenderFactory(SCHEMA); | ||
|
|
||
| @Test | ||
| public void testPause() throws Exception { | ||
| IcebergSourceSplitReader<RowData> reader = reader(); | ||
|
|
||
| List<List<Record>> records = | ||
| ImmutableList.of( | ||
| RandomGenericData.generate(SCHEMA, 2, 0L), RandomGenericData.generate(SCHEMA, 3, 1L)); | ||
|
|
||
| IcebergSourceSplit split = | ||
| ReaderUtil.createSplit(records, TEMPORARY_FOLDER, FileFormat.PARQUET, APPENDER_FACTORY); | ||
|
|
||
| // Add the new split to the reader | ||
| reader.handleSplitsChanges(new SplitsAddition<>(ImmutableList.of(split))); | ||
|
|
||
| // Fetch the first batch, and check the result size | ||
| ArrayBatchRecords<RecordAndPosition<RowData>> result = (ArrayBatchRecords) reader.fetch(); | ||
| assertThat(result.numberOfRecords()).isEqualTo(2); | ||
|
|
||
| // Pause the reading of the split, and check that the read is blocked when trying to fetch new | ||
| // records | ||
| reader.pauseOrResumeSplits(ImmutableList.of(split), ImmutableList.of()); | ||
| assertThatThrownBy( | ||
| () -> | ||
| Awaitility.await().atMost(2, TimeUnit.SECONDS).until(() -> reader.fetch() != null)) | ||
| .isInstanceOf(ConditionTimeoutException.class) | ||
| .hasMessageContaining("was not fulfilled within"); | ||
|
|
||
| // Unpause the reading of the split, and check the result size | ||
| reader.pauseOrResumeSplits(ImmutableList.of(), ImmutableList.of(split)); | ||
| result = (ArrayBatchRecords) reader.fetch(); | ||
| assertThat(result.numberOfRecords()).isEqualTo(3); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWakeup() throws Exception { | ||
| IcebergSourceSplitReader<RowData> reader = reader(); | ||
|
|
||
| List<List<Record>> records = | ||
| ImmutableList.of( | ||
| RandomGenericData.generate(SCHEMA, 2, 0L), RandomGenericData.generate(SCHEMA, 3, 1L)); | ||
| IcebergSourceSplit split = | ||
| ReaderUtil.createSplit(records, TEMPORARY_FOLDER, FileFormat.PARQUET, APPENDER_FACTORY); | ||
|
|
||
| // Add the new split to the reader | ||
| reader.handleSplitsChanges(new SplitsAddition<>(ImmutableList.of(split))); | ||
|
|
||
| // Fetch the first batch, and check the result size | ||
| ArrayBatchRecords<RecordAndPosition<RowData>> result = (ArrayBatchRecords) reader.fetch(); | ||
| assertThat(result.numberOfRecords()).isEqualTo(2); | ||
|
|
||
| // Pause the reading of the split, and check that the read is blocked when trying to fetch new | ||
| // records | ||
| reader.pauseOrResumeSplits(ImmutableList.of(split), ImmutableList.of()); | ||
| assertThatThrownBy( | ||
| () -> | ||
| Awaitility.await().atMost(2, TimeUnit.SECONDS).until(() -> reader.fetch() != null)) | ||
| .isInstanceOf(ConditionTimeoutException.class) | ||
| .hasMessageContaining("was not fulfilled within"); | ||
|
|
||
| // Wakeup the reading of the split, and check the result size | ||
| reader.wakeUp(); | ||
| result = (ArrayBatchRecords) reader.fetch(); | ||
| assertThat(result.numberOfRecords()).isEqualTo(3); | ||
| } | ||
|
|
||
| private static IcebergSourceSplitReader reader() { | ||
| TestingMetricGroup metricGroup = new TestingMetricGroup(); | ||
| TestingReaderContext readerContext = new TestingReaderContext(new Configuration(), metricGroup); | ||
| RowDataReaderFunction readerFunction = | ||
| new RowDataReaderFunction( | ||
| new Configuration(), | ||
| SCHEMA, | ||
| SCHEMA, | ||
| null, | ||
| true, | ||
| new HadoopFileIO(new org.apache.hadoop.conf.Configuration()), | ||
| new PlaintextEncryptionManager(), | ||
| Collections.emptyList()); | ||
|
|
||
| return new IcebergSourceSplitReader<>( | ||
| new IcebergSourceReaderMetrics(metricGroup, "dummy"), | ||
| readerFunction, | ||
| SplitComparators.fileSequenceNumber(), | ||
| readerContext); | ||
| } | ||
| } |