From 78c78aa51a3b27ddb78003bc385ec36ebfeac06a Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Mon, 27 Feb 2023 10:50:38 -0800 Subject: [PATCH 1/2] Fix NPE in KinesisSupervisor#setupRecordSupplier. PR #13539 refactored record supplier creation and introduced a bug: this method would throw NPE when recordsPerFetch was not provided by the user. recordsPerFetch isn't needed in this context at all, since the supervisor-side supplier doesn't fetch records. So this patch sets it to zero. --- .../druid/indexing/kinesis/supervisor/KinesisSupervisor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java index 2bc7642c8ed5..accd8316f66f 100644 --- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java +++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java @@ -197,7 +197,7 @@ protected RecordSupplier setupRecordSupplier() throw ioConfig.getAwsAssumedRoleArn(), ioConfig.getAwsExternalId() ), - ioConfig.getRecordsPerFetch(), + 0, // no records-per-fetch, it is not used ioConfig.getFetchDelayMillis(), 0, // skip starting background fetch, it is not used ioConfig.isDeaggregate(), From ddd80a438be1812e8416d0accdcf75d8bcb28662 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Mon, 27 Feb 2023 11:52:41 -0800 Subject: [PATCH 2/2] Remove unused imports. --- .../org/apache/druid/server/coordinator/DruidCoordinator.java | 1 - .../apache/druid/server/coordinator/duty/CompactSegments.java | 1 - 2 files changed, 2 deletions(-) diff --git a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java index a5912a765c2b..8fce69e340b2 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java @@ -19,7 +19,6 @@ package org.apache.druid.server.coordinator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; diff --git a/server/src/main/java/org/apache/druid/server/coordinator/duty/CompactSegments.java b/server/src/main/java/org/apache/druid/server/coordinator/duty/CompactSegments.java index 47456a28dbc4..63267c81b8dd 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/duty/CompactSegments.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/duty/CompactSegments.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; import org.apache.druid.client.indexing.ClientCompactionTaskDimensionsSpec;