Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ private void updateEvictableCkp(long checkpointId) {
minRetainedCheckpointId = checkpointId;
}

private long inferMemorySizeForCache() {
@VisibleForTesting
long inferMemorySizeForCache() {
int concurrentPartitionsNum = conf.get(FlinkOptions.INDEX_RLI_CACHE_CONCURRENT_PARTITIONS_NUM);
if (partitionBucketCaches.isEmpty()) {
return maxCacheSizeInBytes / concurrentPartitionsNum;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,48 @@
import org.apache.hudi.common.util.queue.HoodieConsumer;
import org.apache.hudi.configuration.FlinkOptions;
import org.apache.hudi.sink.buffer.BufferType;
import org.apache.hudi.sink.utils.TestWriteBase;
import org.apache.hudi.utils.TestConfigurations;
import org.apache.hudi.utils.TestData;

import org.apache.avro.generic.GenericRecord;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
import org.apache.flink.table.types.logical.RowType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;

import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* Unit tests for buffer sort configuration resolution in {@link AppendWriteFunctions}.
* Unit tests for append write functions with buffer sorting.
*/
public class TestAppendWriteFunctionWithBufferSort {

private Configuration conf;

@TempDir
File tempFile;

@BeforeEach
void setUp() {
conf = new Configuration();
Expand Down Expand Up @@ -81,6 +100,114 @@ public void testCustomSortKeysOverrideDefault() {
assertEquals(Arrays.asList("age", "name"), resolvedSortKeys);
}

@Test
public void testEmptySortKeysAreRejected() {
conf.set(FlinkOptions.WRITE_BUFFER_SORT_KEYS, " , , ");

assertThrows(IllegalArgumentException.class, () -> AppendWriteFunctions.resolveSortKeys(conf));
}

@ParameterizedTest
@EnumSource(BufferType.class)
public void testFactorySelectsConfiguredBuffer(BufferType bufferType) {
conf.set(FlinkOptions.WRITE_BUFFER_TYPE, bufferType.name());
RowType rowType = TestConfigurations.ROW_TYPE;

AppendWriteFunction<RowData> function = AppendWriteFunctions.create(conf, rowType);

switch (bufferType) {
case CONTINUOUS_SORT:
assertInstanceOf(AppendWriteFunctionWithContinuousSort.class, function);
break;
case DISRUPTOR:
assertInstanceOf(AppendWriteFunctionWithDisruptorBufferSort.class, function);
break;
case BOUNDED_IN_MEMORY:
assertInstanceOf(AppendWriteFunctionWithBIMBufferSort.class, function);
break;
case NONE:
assertEquals(AppendWriteFunction.class, function.getClass());
break;
default:
throw new AssertionError("Unexpected buffer type " + bufferType);
}
}

@ParameterizedTest
@EnumSource(value = BufferType.class, names = {"CONTINUOUS_SORT", "DISRUPTOR", "BOUNDED_IN_MEMORY"})
public void testBufferedAppendFunctionsWriteAndFlushOnCheckpoint(BufferType bufferType) throws Exception {
Configuration writeConf = TestConfigurations.getDefaultConf(tempFile.getAbsolutePath());

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 nit: this writeConf setup block (operation/metadata/buffer type/sort keys/size + the continuous/disruptor if-else) is duplicated verbatim in testBufferedAppendFunctionsPersistRowsInSortOrder — could you pull it into a small buildWriteConf(bufferType) helper?

⚠️ AI-generated; verify before applying. React 👍/👎 to flag quality.

writeConf.set(FlinkOptions.OPERATION, "insert");
writeConf.set(FlinkOptions.METADATA_ENABLED, false);
writeConf.set(FlinkOptions.WRITE_BUFFER_TYPE, bufferType.name());
writeConf.set(FlinkOptions.WRITE_BUFFER_SORT_KEYS, "name,age");
writeConf.set(FlinkOptions.WRITE_BUFFER_SIZE, 3L);
if (bufferType == BufferType.CONTINUOUS_SORT) {
writeConf.set(FlinkOptions.WRITE_BUFFER_SORT_CONTINUOUS_DRAIN_SIZE, 1);
} else if (bufferType == BufferType.DISRUPTOR) {
writeConf.set(FlinkOptions.WRITE_BUFFER_DISRUPTOR_RING_SIZE, 16);
}

TestWriteBase.TestHarness harness = TestWriteBase.TestHarness.instance()
.preparePipeline(tempFile, writeConf);
try {
harness
.consume(TestData.DATA_SET_INSERT)
.checkpoint(1)
.assertNextEvent(4, "par1,par2,par3,par4")
.checkpointComplete(1);
} finally {
harness.end();
}
}

@ParameterizedTest
@EnumSource(value = BufferType.class, names = {"CONTINUOUS_SORT", "DISRUPTOR", "BOUNDED_IN_MEMORY"})
public void testBufferedAppendFunctionsPersistRowsInSortOrder(BufferType bufferType) throws Exception {
Configuration writeConf = TestConfigurations.getDefaultConf(tempFile.getAbsolutePath());
writeConf.set(FlinkOptions.OPERATION, "insert");
writeConf.set(FlinkOptions.METADATA_ENABLED, false);
writeConf.set(FlinkOptions.WRITE_BUFFER_TYPE, bufferType.name());
writeConf.set(FlinkOptions.WRITE_BUFFER_SORT_KEYS, "name,age");
writeConf.set(FlinkOptions.WRITE_BUFFER_SIZE, 3L);
if (bufferType == BufferType.CONTINUOUS_SORT) {
writeConf.set(FlinkOptions.WRITE_BUFFER_SORT_CONTINUOUS_DRAIN_SIZE, 1);
} else if (bufferType == BufferType.DISRUPTOR) {
writeConf.set(FlinkOptions.WRITE_BUFFER_DISRUPTOR_RING_SIZE, 16);
}

List<RowData> inputData = Arrays.asList(
TestData.insertRow(StringData.fromString("uuid1"), StringData.fromString("Bob"), 30,
TimestampData.fromEpochMillis(1123), StringData.fromString("p1")),
TestData.insertRow(StringData.fromString("uuid2"), StringData.fromString("Alice"), 25,
TimestampData.fromEpochMillis(1124), StringData.fromString("p1")),
TestData.insertRow(StringData.fromString("uuid3"), StringData.fromString("Bob"), 21,
TimestampData.fromEpochMillis(31124), StringData.fromString("p1")));
List<String> expected = Arrays.asList(
"uuid2,Alice,25,1970-01-01 00:00:01.124,p1",
"uuid3,Bob,21,1970-01-01 00:00:31.124,p1",
"uuid1,Bob,30,1970-01-01 00:00:01.123,p1");

TestWriteBase.TestHarness harness = TestWriteBase.TestHarness.instance()
.preparePipeline(tempFile, writeConf);
try {
harness
.consume(inputData)
.checkpoint(1)
.assertNextEvent(1, "p1")
.checkpointComplete(1);

List<GenericRecord> persistedRows =
TestData.readAllData(new File(writeConf.get(FlinkOptions.PATH)), TestConfigurations.ROW_TYPE, 1);
Comment thread
cshuo marked this conversation as resolved.
List<String> actual = persistedRows.stream()
.map(TestData::filterOutVariablesWithoutHudiMetadata)
.collect(Collectors.toList());
assertArrayEquals(expected.toArray(), actual.toArray());
} finally {
harness.end();
}
}

// -------------------------------------------------------------------------
// Tests for DisruptorMessageQueue.waitUntilDrained()
// -------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

/**
* Test cases for {@link BulkInsertWriterHelper}.
Expand Down Expand Up @@ -105,6 +106,22 @@ void testWrite() throws Exception {
TestData.checkWrittenData(tempFile, expected2, 4, TestBulkInsertWriteHelper::filterCommitTime);
}

@Test
void testInvalidRecordIsWrappedAsIOException() {
HoodieFlinkTable<?> table = FlinkTables.createTable(conf);
BulkInsertWriterHelper writerHelper = new BulkInsertWriterHelper(
conf,
table,
table.getConfig(),
WriteClientTestUtils.createNewInstantTime(),
1,
1,
0,
TestConfigurations.ROW_TYPE);

assertThrows(IOException.class, () -> writerHelper.write(new GenericRowData(0)));
}

private void assertWriteStatus(List<WriteStatus> writeStatusList) {
String partitions = writeStatusList.stream()
.map(writeStatus -> StringUtils.nullToEmpty(writeStatus.getStat().getPartitionPath()))
Expand Down
Loading
Loading