mcvsubbu commented on a change in pull request #6661: URL: https://github.com/apache/incubator-pinot/pull/6661#discussion_r612095454
########## File path: pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerIntegrationTest.java ########## @@ -0,0 +1,69 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.plugin.stream.kinesis; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.pinot.spi.stream.StreamConfigProperties; +import software.amazon.awssdk.services.kinesis.model.Shard; +import software.amazon.awssdk.services.kinesis.model.ShardIteratorType; + + +public class KinesisConsumerIntegrationTest { Review comment: Is this some example code? why do we have a main() here? ########## File path: pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumer.java ########## @@ -0,0 +1,194 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.plugin.stream.kinesis; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import org.apache.pinot.spi.stream.PartitionGroupConsumer; +import org.apache.pinot.spi.stream.StreamPartitionMsgOffset; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import software.amazon.awssdk.services.kinesis.KinesisClient; +import software.amazon.awssdk.services.kinesis.model.ExpiredIteratorException; +import software.amazon.awssdk.services.kinesis.model.GetRecordsRequest; +import software.amazon.awssdk.services.kinesis.model.GetRecordsResponse; +import software.amazon.awssdk.services.kinesis.model.GetShardIteratorRequest; +import software.amazon.awssdk.services.kinesis.model.InvalidArgumentException; +import software.amazon.awssdk.services.kinesis.model.KinesisException; +import software.amazon.awssdk.services.kinesis.model.ProvisionedThroughputExceededException; +import software.amazon.awssdk.services.kinesis.model.Record; +import software.amazon.awssdk.services.kinesis.model.ResourceNotFoundException; +import software.amazon.awssdk.services.kinesis.model.ShardIteratorType; + + +/** + * A {@link PartitionGroupConsumer} implementation for the Kinesis stream + */ +public class KinesisConsumer extends KinesisConnectionHandler implements PartitionGroupConsumer { + private final Logger LOG = LoggerFactory.getLogger(KinesisConsumer.class); + private final String _stream; + private final int _maxRecords; + private final ExecutorService _executorService; + private final ShardIteratorType _shardIteratorType; + + public KinesisConsumer(KinesisConfig kinesisConfig) { + super(kinesisConfig.getStream(), kinesisConfig.getAwsRegion()); + _stream = kinesisConfig.getStream(); + _maxRecords = kinesisConfig.maxRecordsToFetch(); + _shardIteratorType = kinesisConfig.getShardIteratorType(); + _executorService = Executors.newSingleThreadExecutor(); + } + + public KinesisConsumer(KinesisConfig kinesisConfig, KinesisClient kinesisClient) { + super(kinesisConfig.getStream(), kinesisConfig.getAwsRegion(), kinesisClient); + _kinesisClient = kinesisClient; + _stream = kinesisConfig.getStream(); + _maxRecords = kinesisConfig.maxRecordsToFetch(); + _shardIteratorType = kinesisConfig.getShardIteratorType(); + _executorService = Executors.newSingleThreadExecutor(); + } + + /** + * Fetch records from the Kinesis stream between the start and end KinesisCheckpoint + */ + @Override + public KinesisRecordsBatch fetchMessages(StreamPartitionMsgOffset startCheckpoint, + StreamPartitionMsgOffset endCheckpoint, int timeoutMs) { + List<Record> recordList = new ArrayList<>(); + Future<KinesisRecordsBatch> kinesisFetchResultFuture = + _executorService.submit(() -> getResult(startCheckpoint, endCheckpoint, recordList)); + + try { + return kinesisFetchResultFuture.get(timeoutMs, TimeUnit.MILLISECONDS); + } catch (Exception e) { + return handleException((KinesisPartitionGroupOffset) startCheckpoint, recordList); + } + } + + private KinesisRecordsBatch getResult(StreamPartitionMsgOffset start, StreamPartitionMsgOffset end, + List<Record> recordList) { + KinesisPartitionGroupOffset kinesisStartCheckpoint = (KinesisPartitionGroupOffset) start; + + try { + + if (_kinesisClient == null) { + createConnection(); + } + + //TODO: iterate upon all the shardIds in the map + // Okay for now, since we have assumed that every partition group contains a single shard + Map.Entry<String, String> shardToSequenceNum = + kinesisStartCheckpoint.getShardToStartSequenceMap().entrySet().iterator().next(); + String shardIterator = getShardIterator(shardToSequenceNum.getKey(), shardToSequenceNum.getValue()); + + String kinesisEndSequenceNumber = null; + + if (end != null) { + KinesisPartitionGroupOffset kinesisEndCheckpoint = (KinesisPartitionGroupOffset) end; + kinesisEndSequenceNumber = kinesisEndCheckpoint.getShardToStartSequenceMap().values().iterator().next(); + } + + String nextStartSequenceNumber = null; + boolean isEndOfShard = false; + + while (shardIterator != null) { + GetRecordsRequest getRecordsRequest = GetRecordsRequest.builder().shardIterator(shardIterator).build(); + GetRecordsResponse getRecordsResponse = _kinesisClient.getRecords(getRecordsRequest); + + if (getRecordsResponse.records().size() > 0) { + recordList.addAll(getRecordsResponse.records()); + nextStartSequenceNumber = recordList.get(recordList.size() - 1).sequenceNumber(); Review comment: If we are iterating through shards then we should be getting a vector of sequence numbers, right? We seem to be keeping track of the sequence number of the last shard we examined? Othewise add a PreCondition that the shardlist has exactly one shard. ########## File path: pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerIntegrationTest.java ########## @@ -0,0 +1,69 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.plugin.stream.kinesis; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.pinot.spi.stream.StreamConfigProperties; +import software.amazon.awssdk.services.kinesis.model.Shard; +import software.amazon.awssdk.services.kinesis.model.ShardIteratorType; + + +public class KinesisConsumerIntegrationTest { + + private static final String STREAM_NAME = "kinesis-test"; + private static final String AWS_REGION = "us-west-2"; + + public static void main(String[] args) + throws IOException { + Map<String, String> props = new HashMap<>(); + props.put(StreamConfigProperties + .constructStreamProperty(KinesisConfig.STREAM_TYPE, StreamConfigProperties.STREAM_TOPIC_NAME), STREAM_NAME); + props.put(KinesisConfig.AWS_REGION, AWS_REGION); + props.put(KinesisConfig.MAX_RECORDS_TO_FETCH, "10"); + props.put(KinesisConfig.SHARD_ITERATOR_TYPE, ShardIteratorType.AT_SEQUENCE_NUMBER.toString()); + KinesisConfig kinesisConfig = new KinesisConfig(props); + KinesisConnectionHandler kinesisConnectionHandler = new KinesisConnectionHandler(STREAM_NAME, AWS_REGION); + List<Shard> shardList = kinesisConnectionHandler.getShards(); + for (Shard shard : shardList) { + System.out.println("SHARD: " + shard.shardId()); Review comment: Use logger (if this is a real test) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
