Skip to content
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

Jump to bottom

CDC Wait for Values #2618

Merged
merged 2 commits into from
Mar 25, 2021
Merged

CDC Wait for Values #2618

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0079c
queue does not block
cgardens Mar 25, 2021
6e34eed
wait
cgardens Mar 25, 2021
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
55 changes: 52 additions & 3 deletions ...source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@

package io.airbyte.integrations.source.postgres;

import static java.lang.Thread.sleep;

import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.functional.CheckedConsumer;
import io.airbyte.commons.json.Jsons;
Expand All @@ -47,6 +50,7 @@
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
Expand All @@ -55,7 +59,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream;
import java.util.function.Predicate;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -156,8 +160,53 @@ public List<AutoCloseableIterator<AirbyteMessage>> getIncrementalIterators(JsonN
// Run the engine asynchronously ...
executor.execute(engine);

final Stream<JsonNode> jsonStream = Queues.toStream(queue);
final AutoCloseableIterator<JsonNode> jsonIterator = AutoCloseableIterators.fromStream(jsonStream);
// todo - this obviously needs to actually do something.
final Predicate<Object> hasReachedLsnPredicate = (r) -> false;
final Iterator<JsonNode> queueIterator = Queues.toStream(queue).iterator();
final AbstractIterator<JsonNode> iterator = new AbstractIterator<>() {

private boolean hasReachedLsn = false;

@Override
protected JsonNode computeNext() {
// if we have reached the lsn we stop, otherwise we have the potential to wait indefinitely for the
// next value.
if (!hasReachedLsn) {
while (!queueIterator.hasNext()) {
LOGGER.info("sleeping.");
try {
sleep(5000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}

final JsonNode next = queueIterator.next();
LOGGER.info("next {}", next);
// todo fix this cast. the record passed to this iterator has to include the lsn somewhere. it can
// either be the full change event or some smaller object that just includes the lsn.
// we guarantee that this will always eventually return true, because we pick an LSN that already
// exists when we start the sync.
if (hasReachedLsnPredicate.test(next)) {
hasReachedLsn = true;
}
return next;
} else {
return endOfData();
}
}

};

final AutoCloseableIterator<JsonNode> jsonIterator = AutoCloseableIterators.fromIterator(iterator, () -> {
engine.close();
executor.shutdown();

if (thrownError.get() != null) {
throw new RuntimeException(thrownError.get());
}
});

final AutoCloseableIterator<AirbyteMessage> messageIterator = AutoCloseableIterators.transform(jsonIterator, r -> new AirbyteMessage()
.withType(AirbyteMessage.Type.RECORD)
.withRecord(new AirbyteRecordMessage()
Expand Down