You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by cw...@apache.org on 2020/01/16 21:47:23 UTC
[druid] branch 0.17.0 updated: Fix deserialization of
maxBytesInMemory (#9092) (#9170)
This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch 0.17.0
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/0.17.0 by this push:
new e6246c9 Fix deserialization of maxBytesInMemory (#9092) (#9170)
e6246c9 is described below
commit e6246c96f7cce9f7d3b5d17ca2cf27a7963eddc3
Author: Clint Wylie <cw...@apache.org>
AuthorDate: Thu Jan 16 13:47:11 2020 -0800
Fix deserialization of maxBytesInMemory (#9092) (#9170)
* Fix deserialization of maxBytesInMemory
* Add maxBytes check
Co-authored-by: Atul Mohan <at...@gmail.com>
---
.../indexing/common/index/RealtimeAppenderatorTuningConfig.java | 1 +
.../java/org/apache/druid/indexing/common/task/TaskSerdeTest.java | 6 +++++-
.../org/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 b66ccc8..eec9b98 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 class RealtimeAppenderatorTuningConfig implements TuningConfig, Appendera
}
@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 2ba37ff..c5841ea 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 class TaskSerdeTest
new RealtimeTuningConfig(
1,
- null,
+ 10L,
new Period("PT10M"),
null,
null,
@@ -446,6 +446,10 @@ public class TaskSerdeTest
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 a467944..728e2ff 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 class RealtimeTuningConfig implements TuningConfig, AppenderatorConfig
}
@Override
+ @JsonProperty
public long getMaxBytesInMemory()
{
return maxBytesInMemory;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org