From 91ebe45b4e9ec33f60e34a297cb301828210cc23 Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 7 Aug 2014 10:06:27 -0700 Subject: [PATCH] support both rejectionPolicy and rejectionPolicyFactory in serde --- .../io/druid/indexing/common/task/RealtimeIndexTask.java | 6 ++++-- .../java/io/druid/indexing/common/TestRealtimeTask.java | 1 + .../java/io/druid/indexing/common/task/TaskSerdeTest.java | 1 + .../java/io/druid/indexing/worker/TaskAnnouncementTest.java | 1 + .../segment/realtime/plumber/FlushingPlumberSchool.java | 4 +++- .../segment/realtime/plumber/RealtimePlumberSchool.java | 5 +++-- .../java/io/druid/segment/realtime/FireDepartmentTest.java | 2 +- .../segment/realtime/plumber/RealtimePlumberSchoolTest.java | 1 + 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java index 57b6c0ddaa1..37055fb4af9 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java @@ -115,7 +115,8 @@ public class RealtimeIndexTask extends AbstractTask @JsonProperty("windowPeriod") Period windowPeriod, @JsonProperty("maxPendingPersists") int maxPendingPersists, @JsonProperty("segmentGranularity") Granularity segmentGranularity, - @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicyFactory + @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicy, + @JsonProperty("rejectionPolicyFactory") RejectionPolicyFactory rejectionPolicyFactory ) { super( @@ -142,7 +143,7 @@ public class RealtimeIndexTask extends AbstractTask windowPeriod, null, null, - rejectionPolicyFactory, + rejectionPolicy == null ? rejectionPolicyFactory : rejectionPolicy, maxPendingPersists, spec.getShardSpec() ), @@ -315,6 +316,7 @@ public class RealtimeIndexTask extends AbstractTask null, null, null, + null, 0 ); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java b/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java index 6220f447bde..5280a884a55 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java @@ -54,6 +54,7 @@ public class TestRealtimeTask extends RealtimeIndexTask null, 1, null, + null, null ); this.status = status; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java index 516ea984301..fc7f13ef3ad 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java @@ -207,6 +207,7 @@ public class TaskSerdeTest new Period("PT10M"), 1, Granularity.HOUR, + null, null ); diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java b/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java index 7aafad53e23..ec593aeee33 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java @@ -49,6 +49,7 @@ public class TaskAnnouncementTest new Period("PT10M"), 1, Granularity.HOUR, + null, null ); final TaskStatus status = TaskStatus.running(task.getId()); diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java b/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java index 611d16b476f..a90fe44d352 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java +++ b/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java @@ -65,7 +65,8 @@ public class FlushingPlumberSchool extends RealtimePlumberSchool @JsonProperty("basePersistDirectory") File basePersistDirectory, @JsonProperty("segmentGranularity") Granularity segmentGranularity, @JsonProperty("versioningPolicy") VersioningPolicy versioningPolicy, - @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicyFactory, + @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicy, + @JsonProperty("rejectionPolicyFactory") RejectionPolicyFactory rejectionPolicyFactory, @JsonProperty("maxPendingPersists") int maxPendingPersists ) { @@ -81,6 +82,7 @@ public class FlushingPlumberSchool extends RealtimePlumberSchool basePersistDirectory, segmentGranularity, versioningPolicy, + rejectionPolicy, rejectionPolicyFactory, maxPendingPersists ); diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java b/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java index 43020d7cc53..b3b602b8212 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java +++ b/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java @@ -75,7 +75,8 @@ public class RealtimePlumberSchool implements PlumberSchool @JsonProperty("basePersistDirectory") File basePersistDirectory, @JsonProperty("segmentGranularity") Granularity segmentGranularity, @JsonProperty("versioningPolicy") VersioningPolicy versioningPolicy, - @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicyFactory, + @JsonProperty("rejectionPolicy") RejectionPolicyFactory rejectionPolicy, + @JsonProperty("rejectionPolicyFactory") RejectionPolicyFactory rejectionPolicyFactory, @JsonProperty("maxPendingPersists") int maxPendingPersists ) { @@ -90,7 +91,7 @@ public class RealtimePlumberSchool implements PlumberSchool this.basePersistDirectory = basePersistDirectory; this.segmentGranularity = segmentGranularity; this.versioningPolicy = versioningPolicy; - this.rejectionPolicyFactory = rejectionPolicyFactory; + this.rejectionPolicyFactory = (rejectionPolicy == null) ? rejectionPolicyFactory : rejectionPolicy; this.maxPendingPersists = maxPendingPersists; } diff --git a/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java b/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java index 19c104a4ff0..0113ee3dbc1 100644 --- a/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java +++ b/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java @@ -73,7 +73,7 @@ public class FireDepartmentTest new RealtimeIOConfig( null, new RealtimePlumberSchool( - null, null, null, null, null, null, null, null, null, null, null, null, 0 + null, null, null, null, null, null, null, null, null, null, null, null, null, 0 ) ), new RealtimeTuningConfig( diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index db5ae44be8f..10779eec8bd 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -149,6 +149,7 @@ public class RealtimePlumberSchoolTest Granularity.HOUR, new IntervalStartVersioningPolicy(), new NoopRejectionPolicyFactory(), + null, 0 );