v2.14 release

pom.xml

@@ -6,7 +6,7 @@
 
  <groupId>in.zapr.druid</groupId>
  <artifactId>druidry</artifactId>
- <version>2.13</version>
+ <version>2.14-SNAPSHOT</version>
 
  <name>Druidry - Druid Java Client</name>
  <description>Druidry is an open-source Java based utility library which supports creating

src/main/java/in/zapr/druid/druidry/extensions/datasketches/postAggregator/ThetaSketchEstimatePostAggregator.java

@@ -16,18 +16,22 @@
 
 package in.zapr.druid.druidry.extensions.datasketches.postAggregator;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import in.zapr.druid.druidry.postAggregator.DruidPostAggregator;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
 public class ThetaSketchEstimatePostAggregator extends DruidPostAggregator {
 
  private static final String THETA_SKETCH_ESTIMATE_POST_AGGREGATOR_TYPE = "thetaSketchEstimate";
 
  private DruidPostAggregator field;
+ private Integer errorBoundsStdDev;
 
  public ThetaSketchEstimatePostAggregator(@NonNull String name,
  @NonNull DruidPostAggregator field) {
@@ -36,4 +40,11 @@ public ThetaSketchEstimatePostAggregator(@NonNull String name,
  this.field = field;
  }
 
+ public ThetaSketchEstimatePostAggregator(@NonNull String name,
+ @NonNull DruidPostAggregator field,
+ Integer errorBoundsStdDev) {
+ this(name, field);
+ this.errorBoundsStdDev = errorBoundsStdDev;
+ }
+
 }

src/main/java/in/zapr/druid/druidry/query/aggregation/DruidGroupByQuery.java

@@ -41,7 +41,6 @@ public class DruidGroupByQuery extends DruidAggregationQuery {
 
  private DefaultLimitSpec limitSpec;
  private String having;
-
  @NonNull
  private List<DruidDimension> dimensions;
 

src/test/java/in/zapr/druid/druidry/extensions/datasketches/postAggregator/ThetaSketchEstimatePostAggregatorTest.java

@@ -49,7 +49,7 @@ private JSONObject getFieldAccessJSON() throws JSONException {
  }
 
  @Test
- public void testAllFieldsWithFieldAccess() throws JsonProcessingException, JSONException {
+ public void testRequiredFieldsWithFieldAccess() throws JsonProcessingException, JSONException {
 
  FieldAccessPostAggregator fieldAccessPostAggregator =
  new FieldAccessPostAggregator("stars");
@@ -71,6 +71,30 @@ public void testAllFieldsWithFieldAccess() throws JsonProcessingException, JSONE
 
  }
 
+ @Test
+ public void testAllFieldsWithFieldAccess() throws JsonProcessingException, JSONException {
+
+ FieldAccessPostAggregator fieldAccessPostAggregator =
+ new FieldAccessPostAggregator("stars");
+
+ ThetaSketchEstimatePostAggregator thetaSketchEstimatePostAggregator =
+ new ThetaSketchEstimatePostAggregator("estimate_stars", fieldAccessPostAggregator, 2);
+
+
+ JSONObject fieldAccess = getFieldAccessJSON();
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("type", "thetaSketchEstimate");
+ jsonObject.put("name", "estimate_stars");
+ jsonObject.put("errorBoundsStdDev", 2);
+ jsonObject.put("field", fieldAccess);
+
+ String actualJSON = objectMapper.writeValueAsString(thetaSketchEstimatePostAggregator);
+ String expectedJSON = jsonObject.toString();
+ JSONAssert.assertEquals(expectedJSON, actualJSON, JSONCompareMode.NON_EXTENSIBLE);
+
+ }
+
  @Test
  public void testAllFieldsWithThetaSketchSetOp() throws JsonProcessingException, JSONException {
 
@@ -84,7 +108,7 @@ public void testAllFieldsWithThetaSketchSetOp() throws JsonProcessingException,
  .build();
 
  ThetaSketchEstimatePostAggregator thetaSketchEstimatePostAggregator =
- new ThetaSketchEstimatePostAggregator("estimate_stars", thetaSketchSetOpPostAggregator);
+ new ThetaSketchEstimatePostAggregator("estimate_stars", thetaSketchSetOpPostAggregator, 2);
 
 
  JSONObject fieldAccess = getFieldAccessJSON();
@@ -100,6 +124,7 @@ public void testAllFieldsWithThetaSketchSetOp() throws JsonProcessingException,
  JSONObject jsonObject = new JSONObject();
  jsonObject.put("type", "thetaSketchEstimate");
  jsonObject.put("name", "estimate_stars");
+ jsonObject.put("errorBoundsStdDev", 2);
  jsonObject.put("field", thetaSketchSetOp);
 
  String actualJSON = objectMapper.writeValueAsString(thetaSketchEstimatePostAggregator);