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

[FLINK-21875][hotfix] Fix compilation error in IntelliJ for GSR test #15290

Merged
merged 1 commit into from
Mar 19, 2021
Merged

[FLINK-21875][hotfix] Fix compilation error in IntelliJ for GSR test #15290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[FLINK-21875][hotfix] Fix compilation error in IntelliJ. Removing rel… 
…iance on shaded classes.
  • Loading branch information
@dannycranmer
dannycranmer committed Mar 19, 2021
commit 0b9951558f600d9f5c5d75dbdb7be0e25bb6a879
16 changes: 13 additions & 3 deletions ...est/java/org/apache/flink/streaming/connectors/kinesis/testutils/KinesisPubsubClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.function.Function;

/**
* Simple client to publish and retrieve messages, using the AWS Kinesis SDK and the Flink Kinesis
Expand Down Expand Up @@ -87,15 +88,24 @@ public void createTopic(String stream, int shards, Properties props) throws Exce
}

public void sendMessage(String topic, String msg) {
sendMessage(topic, msg.getBytes());
}

public void sendMessage(String topic, byte[] data) {
PutRecordRequest putRecordRequest = new PutRecordRequest();
putRecordRequest.setStreamName(topic);
putRecordRequest.setPartitionKey("fakePartitionKey");
putRecordRequest.withData(ByteBuffer.wrap(msg.getBytes()));
putRecordRequest.withData(ByteBuffer.wrap(data));
PutRecordResult putRecordResult = kinesisClient.putRecord(putRecordRequest);
LOG.info("added record: {}", putRecordResult.getSequenceNumber());
}

public List<String> readAllMessages(String streamName) throws Exception {
return readAllMessages(streamName, String::new);
}

public <T> List<T> readAllMessages(String streamName, Function<byte[], T> deserialiser)
throws Exception {
KinesisProxyInterface kinesisProxy = KinesisProxy.create(properties);
Map<String, String> streamNamesWithLastSeenShardIds = new HashMap<>();
streamNamesWithLastSeenShardIds.put(streamName, null);
Expand All @@ -104,15 +114,15 @@ public List<String> readAllMessages(String streamName) throws Exception {
kinesisProxy.getShardList(streamNamesWithLastSeenShardIds);
int maxRecordsToFetch = 10;

List<String> messages = new ArrayList<>();
List<T> messages = new ArrayList<>();
// retrieve records from all shards
for (StreamShardHandle ssh : shardListResult.getRetrievedShardListOfStream(streamName)) {
String shardIterator = kinesisProxy.getShardIterator(ssh, "TRIM_HORIZON", null);
GetRecordsResult getRecordsResult =
kinesisProxy.getRecords(shardIterator, maxRecordsToFetch);
List<Record> aggregatedRecords = getRecordsResult.getRecords();
for (Record record : aggregatedRecords) {
messages.add(new String(record.getData().array()));
messages.add(deserialiser.apply(record.getData().array()));
}
}
return messages;
Expand Down
107 changes: 13 additions & 94 deletions ...test/src/main/java/org/apache/flink/glue/schema/registry/test/GSRKinesisPubsubClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,18 @@

package org.apache.flink.glue.schema.registry.test;

import org.apache.flink.api.common.time.Deadline;
import org.apache.flink.kinesis.shaded.com.amazonaws.services.kinesis.model.GetRecordsResult;
import org.apache.flink.kinesis.shaded.com.amazonaws.services.kinesis.model.Record;
import org.apache.flink.streaming.connectors.kinesis.config.ConsumerConfigConstants;
import org.apache.flink.streaming.connectors.kinesis.model.StreamShardHandle;
import org.apache.flink.streaming.connectors.kinesis.proxy.GetShardListResult;
import org.apache.flink.streaming.connectors.kinesis.proxy.KinesisProxy;
import org.apache.flink.streaming.connectors.kinesis.proxy.KinesisProxyInterface;
import org.apache.flink.streaming.connectors.kinesis.testutils.KinesisPubsubClient;

import com.amazonaws.AmazonClientException;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
import com.amazonaws.client.builder.AwsClientBuilder;
import com.amazonaws.services.kinesis.AmazonKinesis;
import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
import com.amazonaws.services.kinesis.model.PutRecordRequest;
import com.amazonaws.services.kinesis.model.PutRecordResult;
import com.amazonaws.services.kinesis.model.ResourceNotFoundException;
import com.amazonaws.services.schemaregistry.common.AWSDeserializerInput;
import com.amazonaws.services.schemaregistry.common.AWSSerializerInput;
import com.amazonaws.services.schemaregistry.deserializers.AWSDeserializer;
import com.amazonaws.services.schemaregistry.serializers.avro.AWSAvroSerializer;
import com.amazonaws.services.schemaregistry.utils.AWSSchemaRegistryConstants;
import com.amazonaws.services.schemaregistry.utils.AvroRecordType;
import org.apache.avro.generic.GenericRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;

import java.nio.ByteBuffer;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -60,44 +40,13 @@
* Connectors and Glue Schema Registry classes.
*/
public class GSRKinesisPubsubClient {
private static final Logger LOG = LoggerFactory.getLogger(GSRKinesisPubsubClient.class);

private final AmazonKinesis kinesisClient;
private final Properties properties;
private final KinesisPubsubClient client;

public GSRKinesisPubsubClient(Properties properties) {
this.kinesisClient = createClientWithCredentials(properties);
this.properties = properties;
}

public void createStream(String stream, int shards, Properties props) throws Exception {
try {
kinesisClient.describeStream(stream);
kinesisClient.deleteStream(stream);
} catch (ResourceNotFoundException rnfe) {
// Exception can be ignored
}

kinesisClient.createStream(stream, shards);
Deadline deadline = Deadline.fromNow(Duration.ofSeconds(5));
while (deadline.hasTimeLeft()) {
try {
Thread.sleep(250);
if (kinesisClient.describeStream(stream).getStreamDescription().getShards().size()
!= shards) {
continue;
}
break;
} catch (ResourceNotFoundException rnfe) {
// Exception can be ignored
}
}
this.client = new KinesisPubsubClient(properties);
}

public void sendMessage(String schema, String streamName, GenericRecord msg) {
PutRecordRequest putRecordRequest = new PutRecordRequest();
putRecordRequest.setStreamName(streamName);
putRecordRequest.setPartitionKey("fakePartitionKey");
UUID schemaVersionId =
createSerializer()
.registerSchema(
Expand All @@ -107,42 +56,24 @@ public void sendMessage(String schema, String streamName, GenericRecord msg) {
.transportName(streamName)
.build());

byte[] serializedData = createSerializer().serialize(msg, schemaVersionId);
putRecordRequest.withData(ByteBuffer.wrap(serializedData));
PutRecordResult putRecordResult = kinesisClient.putRecord(putRecordRequest);

LOG.info("added record: {}", putRecordResult.getSequenceNumber());
client.sendMessage(streamName, createSerializer().serialize(msg, schemaVersionId));
}

public List<Object> readAllMessages(String streamName) throws Exception {
KinesisProxyInterface kinesisProxy = KinesisProxy.create(properties);
Map<String, String> streamNamesWithLastSeenShardIds = new HashMap<>();
streamNamesWithLastSeenShardIds.put(streamName, null);

GetShardListResult shardListResult =
kinesisProxy.getShardList(streamNamesWithLastSeenShardIds);
AWSDeserializer awsDeserializer = createDeserializer();
int maxRecordsToFetch = 10;

List<Object> messages = new ArrayList<>();
// retrieve records from all shards
for (StreamShardHandle ssh : shardListResult.getRetrievedShardListOfStream(streamName)) {
String shardIterator = kinesisProxy.getShardIterator(ssh, "TRIM_HORIZON", null);
GetRecordsResult getRecordsResult =
kinesisProxy.getRecords(shardIterator, maxRecordsToFetch);
List<org.apache.flink.kinesis.shaded.com.amazonaws.services.kinesis.model.Record>
aggregatedRecords = getRecordsResult.getRecords();
for (Record record : aggregatedRecords) {
Object obj =
return client.readAllMessages(
streamName,
bytes ->
awsDeserializer.deserialize(
AWSDeserializerInput.builder()
.buffer(ByteBuffer.wrap(record.getData().array()))
.buffer(ByteBuffer.wrap(bytes))
.transportName(streamName)
.build());
messages.add(obj);
}
}
return messages;
.build()));
}

public void createStream(String stream, int shards, Properties props) throws Exception {
client.createTopic(stream, shards, props);
}

private Map<String, Object> getSerDeConfigs() {
Expand All @@ -169,16 +100,4 @@ private AWSDeserializer createDeserializer() {
.credentialProvider(DefaultCredentialsProvider.builder().build())
.build();
}

private static AmazonKinesis createClientWithCredentials(Properties props)
throws AmazonClientException {
AWSCredentialsProvider credentialsProvider = new EnvironmentVariableCredentialsProvider();
return AmazonKinesisClientBuilder.standard()
.withCredentials(credentialsProvider)
.withEndpointConfiguration(
new AwsClientBuilder.EndpointConfiguration(
props.getProperty(ConsumerConfigConstants.AWS_ENDPOINT),
"ca-central-1"))
.build();
}
}