From 3fffd33b779fd9c585f80bf71f8a61ea21373a8b Mon Sep 17 00:00:00 2001 From: Atul Mohan Date: Sun, 12 Jan 2020 22:08:07 -0600 Subject: [PATCH] Fix deserialization of maxBytesInMemory (#9092) * Fix deserialization of maxBytesInMemory * Add maxBytes check --- .../common/index/RealtimeAppenderatorTuningConfig.java | 1 + .../apache/druid/indexing/common/task/TaskSerdeTest.java | 6 +++++- .../apache/druid/segment/indexing/RealtimeTuningConfig.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java index b66ccc86f1d9..eec9b98d4973 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java @@ -143,6 +143,7 @@ public int getMaxRowsInMemory() } @Override + @JsonProperty public long getMaxBytesInMemory() { return maxBytesInMemory; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java index 2ba37ff0bd09..c5841eaa27b4 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java @@ -394,7 +394,7 @@ public void testRealtimeIndexTaskSerde() throws Exception new RealtimeTuningConfig( 1, - null, + 10L, new Period("PT10M"), null, null, @@ -445,6 +445,10 @@ public void testRealtimeIndexTaskSerde() throws Exception task.getRealtimeIngestionSchema().getTuningConfig().getWindowPeriod(), task2.getRealtimeIngestionSchema().getTuningConfig().getWindowPeriod() ); + Assert.assertEquals( + task.getRealtimeIngestionSchema().getTuningConfig().getMaxBytesInMemory(), + task2.getRealtimeIngestionSchema().getTuningConfig().getMaxBytesInMemory() + ); Assert.assertEquals( task.getRealtimeIngestionSchema().getDataSchema().getGranularitySpec().getSegmentGranularity(), task2.getRealtimeIngestionSchema().getDataSchema().getGranularitySpec().getSegmentGranularity() diff --git a/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java index a4679441ce4f..728e2ffac57b 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java @@ -174,6 +174,7 @@ public int getMaxRowsInMemory() } @Override + @JsonProperty public long getMaxBytesInMemory() { return maxBytesInMemory;