Skip to content

[HUDI-4615] Return checkpoint as null for empty data from events queue. #6387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsivabalan merged 4 commits into from
Sep 7, 2022
Merged

[HUDI-4615] Return checkpoint as null for empty data from events queue. #6387

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a9b9b4
Return checkpoint as null for empty data
vinishjail97 Aug 12, 2022
fb86adc
Addressed comments
vinishjail97 Aug 12, 2022
0ff848d
fixing test
nsivabalan Aug 29, 2022
eaf0acc
Fixing tests
nsivabalan Sep 6, 2022
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
4 changes: 3 additions & 1 deletion ...ilities/src/main/java/org/apache/hudi/utilities/sources/helpers/S3EventsMetaSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ public Pair<List<String>, String> getNextEventsFromQueue(AmazonSQS sqs,
for (Map<String, Object> eventRecord : eventRecords) {
filteredEventRecords.add(new ObjectMapper().writeValueAsString(eventRecord).replace("%3D", "="));
}
return new ImmutablePair<>(filteredEventRecords, String.valueOf(newCheckpointTime));
// Return the old checkpoint if no messages to consume from queue.
String newCheckpoint = newCheckpointTime == 0L ? lastCheckpointStr.orElse(null) : String.valueOf(newCheckpointTime);
return new ImmutablePair<>(filteredEventRecords, newCheckpoint);
} catch (JSONException | IOException e) {
throw new HoodieException("Unable to read from SQS: ", e);
}
Expand Down
15 changes: 15 additions & 0 deletions ...ies/src/test/java/org/apache/hudi/utilities/sources/helpers/TestS3EventsMetaSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import static org.apache.hudi.utilities.sources.helpers.CloudObjectsSelector.Config.S3_SOURCE_QUEUE_URL;
import static org.apache.hudi.utilities.sources.helpers.TestCloudObjectsSelector.REGION_NAME;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

public class TestS3EventsMetaSelector extends HoodieClientTestHarness {

Expand Down Expand Up @@ -102,4 +103,18 @@ public void testNextEventsFromQueueShouldReturnsEventsFromQueue(Class<?> clazz)
.getString("key"));
assertEquals("1627376736755", eventFromQueue.getRight());
}

@ParameterizedTest
@ValueSource(classes = {S3EventsMetaSelector.class})
public void testEventsFromQueueNoMessages(Class<?> clazz) {
S3EventsMetaSelector selector = (S3EventsMetaSelector) ReflectionUtils.loadClass(clazz.getName(), props);
List<Message> processed = new ArrayList<>();

Pair<List<String>, String> eventFromQueue =
selector.getNextEventsFromQueue(sqs, Option.empty(), processed);

assertEquals(0, eventFromQueue.getLeft().size());
assertEquals(0, processed.size());
assertNull(eventFromQueue.getRight());
}
}