Skip to content

Adding new state and logic around it #445

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
merged 5 commits into from
Sep 25, 2024
Merged

Adding new state and logic around it #445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e65d37a
Adding new state and logic around it
Sep 25, 2024
3a67019
Adding custom property to clarify customer expectation
Sep 25, 2024
bd10222
Update ProcessingTest.java
Sep 25, 2024
c7b330a
Update RangeContainer.java
Sep 25, 2024
6f8ffe1
Updating the version
Sep 25, 2024
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
3 changes: 3 additions & 0 deletions src/main/java/com/clickhouse/kafka/connect/sink/kafka/RangeContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public RangeState getOverLappingState(RangeContainer rangeContainer) {
// ZEROED [10, 20] Actual [0, 10]
if (actualMinOffset == 0)
return RangeState.ZERO;
// PREVIOUS
if (actualMaxOffset < minOffset)
return RangeState.PREVIOUS;
// ERROR [10, 20] Actual [8, 19]
return RangeState.ERROR;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/clickhouse/kafka/connect/sink/kafka/RangeState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.clickhouse.kafka.connect.sink.kafka;

public enum RangeState {

ZERO(0), //This is for when it seems like the topic has been deleted/recreated
SAME(1),
PREFIX(2),
SUFFIX(3),
CONTAINS(4),
OVER_LAPPING(5),
NEW(6),
ERROR(7);
ERROR(7),
PREVIOUS(8);


private int rangeState;
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/clickhouse/kafka/connect/sink/processing/Processing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public void doLogic(List<Record> records) throws IOException, ExecutionException
doInsert(rightRecords, rightRangeContainer);
stateProvider.setStateRecord(new StateRecord(topic, partition, rightRangeContainer.getMaxOffset(), rightRangeContainer.getMinOffset(), State.AFTER_PROCESSING));
break;
case ERROR:
default: //case ERROR:
throw new RuntimeException(String.format("State MISMATCH given [%s] records for topic: [%s], partition: [%s], minOffset: [%s], maxOffset: [%s], expectedMinOffset: [%s], expectedMaxOffset: [%s]",
records.size(), topic, partition, rangeContainer.getMinOffset(), rangeContainer.getMaxOffset(), stateRecord.getMinOffset(), stateRecord.getMaxOffset()));
}
Expand Down Expand Up @@ -211,7 +211,11 @@ public void doLogic(List<Record> records) throws IOException, ExecutionException
doInsert(rightRecords, rightRangeContainer);
stateProvider.setStateRecord(new StateRecord(topic, partition, rightRangeContainer.getMaxOffset(), rightRangeContainer.getMinOffset(), State.AFTER_PROCESSING));
break;
case ERROR:
case PREVIOUS:
LOGGER.warn("Batch already processed - skipping [{}] records for topic: [{}], partition: [{}], minOffset: [{}], maxOffset: [{}], storedMinOffset: [{}], storedMaxOffset: [{}]",
records.size(), topic, partition, rangeContainer.getMinOffset(), rangeContainer.getMaxOffset(), stateRecord.getMinOffset(), stateRecord.getMaxOffset());
break;
default: //case ERROR:
throw new RuntimeException(String.format("State MISMATCH given [%s] records for topic: [%s], partition: [%s], minOffset: [%s], maxOffset: [%s], expectedMinOffset: [%s], expectedMaxOffset: [%s]",
records.size(), topic, partition, rangeContainer.getMinOffset(), rangeContainer.getMaxOffset(), stateRecord.getMinOffset(), stateRecord.getMaxOffset()));
}
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/com/clickhouse/kafka/connect/sink/processing/ProcessingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,17 @@ public void ProcessPartialOverlappingAfterProcessingTest() throws IOException, E
assertEquals(records.size(), dbWriter.recordsInserted());
}

@Test
@DisplayName("ProcessOldRecordsTest")
public void ProcessOldRecordsTest() throws IOException, ExecutionException, InterruptedException {
List<Record> records = createRecords("test", 1);
List<Record> recordsHead = records.subList(1, 2);
StateProvider stateProvider = new InMemoryState();
stateProvider.setStateRecord(new StateRecord("test", 1, 5000, 4000, State.AFTER_PROCESSING));
DBWriter dbWriter = new InMemoryDBWriter();
Processing processing = new Processing(stateProvider, dbWriter);
processing.doLogic(recordsHead);
assertEquals(0, dbWriter.recordsInserted());
}

}
Loading