feat: Bounded Stream Supervisor

embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/StreamIndexTestBase.java

@@ -120,6 +120,7 @@ protected KinesisSupervisorSpec createKinesisSupervisor(KinesisResource kinesis,
             Period.seconds(60),
             null, null, null, null, null, null, null, null,
             false,
+            null,
             null
         ),
         Map.of(),

embedded-tests/src/test/java/org/apache/druid/testing/embedded/kinesis/KinesisDataFormatsTest.java

@@ -87,6 +87,7 @@ private KinesisSupervisorSpec createKinesisSupervisorSpec(String dataSource, Str
             Period.seconds(5),
             null, null, null, null, null, null, null, null,
             false,
+            null,
             null
         ),
         Map.of(),

extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java

@@ -362,6 +362,33 @@ protected boolean useExclusiveStartSequenceNumberForNonFirstSequence()
     return false;
   }
 
+  @Override
+  protected boolean isOffsetAtOrBeyond(Long current, Long target)
+  {
+    // RabbitMQ uses Long sequence numbers (delivery tags)
+    return current >= target;
+  }
+
+  @Override
+  protected String createPartitionIdFromString(String partitionIdString)
+  {
+    // RabbitMQ uses String as partition ID, so just return the string as-is
+    return partitionIdString;
+  }
+
+  @Override
+  protected Long createSequenceOffsetFromObject(Object offsetObj)
+  {
+    // RabbitMQ uses Long as sequence offset
+    if (offsetObj instanceof Number) {
+      return ((Number) offsetObj).longValue();
+    }
+    if (offsetObj instanceof String) {
+      return Long.parseLong((String) offsetObj);
+    }
+    throw new IllegalArgumentException("Cannot convert " + offsetObj.getClass() + " to Long offset");
+  }
+
   @Override
   public LagStats computeLagStats()
   {

extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorIOConfig.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import org.apache.druid.data.input.InputFormat;
+import org.apache.druid.indexing.seekablestream.supervisor.BoundedStreamConfig;
 import org.apache.druid.indexing.seekablestream.supervisor.IdleConfig;
 import org.apache.druid.indexing.seekablestream.supervisor.LagAggregator;
 import org.apache.druid.indexing.seekablestream.supervisor.SeekableStreamSupervisorIOConfig;
@@ -66,7 +67,8 @@ public RabbitStreamSupervisorIOConfig(
       @JsonProperty("earlyMessageRejectionPeriod") Period earlyMessageRejectionPeriod,
       @JsonProperty("lateMessageRejectionStartDateTime") DateTime lateMessageRejectionStartDateTime,
       @JsonProperty("stopTaskCount") Integer stopTaskCount,
-      @Nullable @JsonProperty("serverPriorityToReplicas") Map<Integer, Integer> serverPriorityToReplicas
+      @Nullable @JsonProperty("serverPriorityToReplicas") Map<Integer, Integer> serverPriorityToReplicas,
+      @Nullable @JsonProperty("boundedStreamConfig") BoundedStreamConfig boundedStreamConfig
   )
   {
     super(
@@ -86,7 +88,8 @@ public RabbitStreamSupervisorIOConfig(
         lateMessageRejectionStartDateTime,
         new IdleConfig(null, null),
         stopTaskCount,
-        serverPriorityToReplicas
+        serverPriorityToReplicas,
+        boundedStreamConfig
     );
 
     this.consumerProperties = consumerProperties;

extensions-contrib/rabbit-stream-indexing-service/src/test/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorIOConfigTest.java

@@ -136,4 +136,80 @@ public void testURIRequired() throws Exception
     mapper.readValue(jsonStr, RabbitStreamSupervisorIOConfig.class);
   }
 
+  @Test
+  public void testBoundedModeSerdeWithIntegerOffsets() throws Exception
+  {
+    String jsonStr = "{\n"
+        + "  \"type\": \"rabbit\",\n"
+        + "  \"stream\": \"my-stream\",\n"
+        + "  \"uri\": \"rabbitmq-stream://localhost:5552\",\n"
+        + "  \"boundedStreamConfig\": {\n"
+        + "    \"startSequenceNumbers\": {\"queue-0\": 100, \"queue-1\": 200},\n"
+        + "    \"endSequenceNumbers\": {\"queue-0\": 500, \"queue-1\": 600}\n"
+        + "  }\n"
+        + "}";
+
+    RabbitStreamSupervisorIOConfig config = mapper.readValue(jsonStr, RabbitStreamSupervisorIOConfig.class);
+
+    Assert.assertTrue(config.isBounded());
+    Assert.assertNotNull(config.getBoundedStreamConfig());
+    Assert.assertEquals(2, config.getBoundedStreamConfig().getStartSequenceNumbers().size());
+    Assert.assertEquals(2, config.getBoundedStreamConfig().getEndSequenceNumbers().size());
+  }
+
+  @Test
+  public void testBoundedModeSerdeWithStringOffsets() throws Exception
+  {
+    String jsonStr = "{\n"
+        + "  \"type\": \"rabbit\",\n"
+        + "  \"stream\": \"my-stream\",\n"
+        + "  \"uri\": \"rabbitmq-stream://localhost:5552\",\n"
+        + "  \"boundedStreamConfig\": {\n"
+        + "    \"startSequenceNumbers\": {\"queue-0\": \"100\", \"queue-1\": \"200\"},\n"
+        + "    \"endSequenceNumbers\": {\"queue-0\": \"500\", \"queue-1\": \"600\"}\n"
+        + "  }\n"
+        + "}";
+
+    RabbitStreamSupervisorIOConfig config = mapper.readValue(jsonStr, RabbitStreamSupervisorIOConfig.class);
+
+    Assert.assertTrue(config.isBounded());
+    Assert.assertNotNull(config.getBoundedStreamConfig());
+    Assert.assertEquals(2, config.getBoundedStreamConfig().getStartSequenceNumbers().size());
+    Assert.assertEquals(2, config.getBoundedStreamConfig().getEndSequenceNumbers().size());
+  }
+
+  @Test
+  public void testBoundedModeSerdeWithMixedOffsets() throws Exception
+  {
+    String jsonStr = "{\n"
+        + "  \"type\": \"rabbit\",\n"
+        + "  \"stream\": \"my-stream\",\n"
+        + "  \"uri\": \"rabbitmq-stream://localhost:5552\",\n"
+        + "  \"boundedStreamConfig\": {\n"
+        + "    \"startSequenceNumbers\": {\"queue-0\": 100, \"queue-1\": \"200\"},\n"
+        + "    \"endSequenceNumbers\": {\"queue-0\": 500, \"queue-1\": \"600\"}\n"
+        + "  }\n"
+        + "}";
+
+    RabbitStreamSupervisorIOConfig config = mapper.readValue(jsonStr, RabbitStreamSupervisorIOConfig.class);
+
+    Assert.assertTrue(config.isBounded());
+    Assert.assertNotNull(config.getBoundedStreamConfig());
+  }
+
+  @Test
+  public void testUnboundedModeByDefault() throws Exception
+  {
+    String jsonStr = "{\n"
+        + "  \"type\": \"rabbit\",\n"
+        + "  \"stream\": \"my-stream\",\n"
+        + "  \"uri\": \"rabbitmq-stream://localhost:5552\"\n"
+        + "}";
+
+    RabbitStreamSupervisorIOConfig config = mapper.readValue(jsonStr, RabbitStreamSupervisorIOConfig.class);
+
+    Assert.assertFalse(config.isBounded());
+    Assert.assertNull(config.getBoundedStreamConfig());
+  }
+
 }

extensions-contrib/rabbit-stream-indexing-service/src/test/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTest.java

@@ -42,6 +42,7 @@
 import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTask;
 import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTaskClient;
 import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTaskIOConfig;
+import org.apache.druid.indexing.seekablestream.supervisor.BoundedStreamConfig;
 import org.apache.druid.indexing.seekablestream.supervisor.SeekableStreamSupervisorReportPayload;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.parsers.JSONPathSpec;
@@ -212,6 +213,7 @@ private RabbitStreamSupervisor getSupervisor(
         earlyMessageRejectionPeriod, // early message rejection
         null, // latemessagerejectionstartdatetime
         1,
+        null,
         null
     );
     RabbitStreamIndexTaskClientFactory clientFactory = new RabbitStreamIndexTaskClientFactory(null,
@@ -278,6 +280,7 @@ public void testRecordSupplier()
         null, // early message rejection
         null, // latemessagerejectionstartdatetime
         1,
+        null,
         null
     );
     RabbitStreamIndexTaskClientFactory clientFactory = new RabbitStreamIndexTaskClientFactory(null,
@@ -421,6 +424,7 @@ public void testCreateTaskIOConfig()
             null, // early message rejection
             null, // latemessagerejectionstartdatetime
             1,
+            null,
             null
         )
     );
@@ -461,4 +465,74 @@ public void test_doesTaskMatchSupervisor()
 
     Assert.assertFalse(supervisor.doesTaskMatchSupervisor(differentTaskType));
   }
+
+  @Test
+  public void testBoundedModeConfiguration()
+  {
+    ImmutableMap<String, Integer> startOffsets = ImmutableMap.of(
+        "queue-0", 100,
+        "queue-1", 200
+    );
+    ImmutableMap<String, Integer> endOffsets = ImmutableMap.of(
+        "queue-0", 500,
+        "queue-1", 600
+    );
+
+    final RabbitStreamSupervisorIOConfig rabbitSupervisorIOConfig = new RabbitStreamSupervisorIOConfig(
+        STREAM,
+        URI,
+        INPUT_FORMAT,
+        1,
+        1,
+        new Period("PT1H"),
+        null,
+        null,
+        null,
+        new Period("PT30M"),
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1000,
+        null,
+        new BoundedStreamConfig(startOffsets, endOffsets)
+    );
+
+    Assert.assertTrue(rabbitSupervisorIOConfig.isBounded());
+    Assert.assertNotNull(rabbitSupervisorIOConfig.getBoundedStreamConfig());
+    Assert.assertEquals(2, rabbitSupervisorIOConfig.getBoundedStreamConfig().getStartSequenceNumbers().size());
+    Assert.assertEquals(2, rabbitSupervisorIOConfig.getBoundedStreamConfig().getEndSequenceNumbers().size());
+
+    // Create supervisor to test type conversion methods
+    supervisor = getSupervisor(
+        "supervisorId",
+        1,
+        1,
+        false,
+        "PT1H",
+        null,
+        null,
+        dataSchema,
+        tuningConfig
+    );
+
+    // Test createPartitionIdFromString
+    String queueName = supervisor.createPartitionIdFromString("queue-0");
+    Assert.assertEquals("queue-0", queueName);
+
+    // Test createSequenceOffsetFromObject with Integer
+    Long offset = supervisor.createSequenceOffsetFromObject(100);
+    Assert.assertEquals(Long.valueOf(100L), offset);
+
+    // Test createSequenceOffsetFromObject with String
+    offset = supervisor.createSequenceOffsetFromObject("200");
+    Assert.assertEquals(Long.valueOf(200L), offset);
+
+    // Test isOffsetAtOrBeyond
+    Assert.assertTrue(supervisor.isOffsetAtOrBeyond(500L, 100L));
+    Assert.assertTrue(supervisor.isOffsetAtOrBeyond(100L, 100L));
+    Assert.assertFalse(supervisor.isOffsetAtOrBeyond(50L, 100L));
+  }
 }

extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java

@@ -390,6 +390,31 @@ protected boolean isShardExpirationMarker(Long seqNum)
     return false;
   }
 
+  @Override
+  protected boolean isOffsetAtOrBeyond(Long current, Long target)
+  {
+    return current >= target;
+  }
+
+  @Override
+  protected KafkaTopicPartition createPartitionIdFromString(String partitionIdString)
+  {
+    return KafkaTopicPartition.fromString(partitionIdString);
+  }
+
+  @Override
+  protected Long createSequenceOffsetFromObject(Object offsetObj)
+  {
+    // Jackson may deserialize numbers as Integer if they fit, but Kafka needs Long
+    if (offsetObj instanceof Number) {
+      return ((Number) offsetObj).longValue();
+    }
+    if (offsetObj instanceof String) {
+      return Long.parseLong((String) offsetObj);
+    }
+    throw new IllegalArgumentException("Cannot convert " + offsetObj.getClass() + " to Long offset");
+  }
+
   @Override
   protected boolean useExclusiveStartSequenceNumberForNonFirstSequence()
   {

extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java

@@ -26,6 +26,7 @@
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.error.InvalidInput;
 import org.apache.druid.indexing.seekablestream.extension.KafkaConfigOverrides;
+import org.apache.druid.indexing.seekablestream.supervisor.BoundedStreamConfig;
 import org.apache.druid.indexing.seekablestream.supervisor.IdleConfig;
 import org.apache.druid.indexing.seekablestream.supervisor.LagAggregator;
 import org.apache.druid.indexing.seekablestream.supervisor.SeekableStreamSupervisorIOConfig;
@@ -78,7 +79,8 @@ public KafkaSupervisorIOConfig(
       @JsonProperty("idleConfig") IdleConfig idleConfig,
       @JsonProperty("stopTaskCount") Integer stopTaskCount,
       @Nullable @JsonProperty("emitTimeLagMetrics") Boolean emitTimeLagMetrics,
-      @Nullable @JsonProperty("serverPriorityToReplicas") Map<Integer, Integer> serverPriorityToReplicas
+      @Nullable @JsonProperty("serverPriorityToReplicas") Map<Integer, Integer> serverPriorityToReplicas,
+      @Nullable @JsonProperty("boundedStreamConfig") BoundedStreamConfig boundedStreamConfig
   )
   {
     super(
@@ -98,7 +100,8 @@ public KafkaSupervisorIOConfig(
         lateMessageRejectionStartDateTime,
         idleConfig,
         stopTaskCount,
-        serverPriorityToReplicas
+        serverPriorityToReplicas,
+        boundedStreamConfig
     );
 
     this.consumerProperties = Preconditions.checkNotNull(consumerProperties, "consumerProperties");

extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaIOConfigBuilder.java

@@ -93,6 +93,7 @@ public KafkaSupervisorIOConfig build()
         idleConfig,
         stopTaskCount,
         null,
+        null,
         null
     );
   }