Adding new settings and two new fields

Author: akshaisarma

examples/storm/src/main/java/com/yahoo/bullet/storm/examples/RandomSpout.java

@@ -55,6 +55,8 @@ public class RandomSpout extends BaseRichSpout {
     public static final String BOOLEAN_MAP = "tags";
     public static final String STATS_MAP = "stats";
     public static final String LIST = "classifiers";
+    public static final String DURATION = "duration";
+    public static final String TYPE = "type";
 
     public static final String RANDOM_MAP_KEY_A = "field_A";
     public static final String RANDOM_MAP_KEY_B = "field_B";
@@ -66,6 +68,7 @@ public class RandomSpout extends BaseRichSpout {
 
     // Some static values in BulletRecord for the fields
     public static final String[] STRING_POOL = { "foo", "bar", "baz", "qux", "quux", "norf" };
+    public static final Integer[] INTEGER_POOL = { 2057, 13, 10051, 2, 1059, 187 };
 
     /**
      * @param args A List of Strings for your Spout. This example takes a number of messages to emit before sleeping and the amount
@@ -139,6 +142,8 @@ private BulletRecord generateRecord() {
         record.setString(STRING, uuid);
         record.setLong(LONG, (long) generatedThisPeriod);
         record.setDouble(DOUBLE, random.nextDouble());
+        record.setString(TYPE, STRING_POOL[random.nextInt(STRING_POOL.length)]);
+        record.setLong(DURATION, System.currentTimeMillis() % INTEGER_POOL[random.nextInt(INTEGER_POOL.length)]);
 
         Map<String, Boolean> booleanMap = new HashMap<>(4);
         booleanMap.put(uuid.substring(0, 8), random.nextBoolean());

examples/storm/src/main/resources/bullet_settings.yaml

@@ -27,30 +27,49 @@ bullet.topology.join.bolt.memory.off.heap.load: 192.0
 bullet.topology.join.bolt.error.tick.timeout: 3
 bullet.topology.join.bolt.rule.tick.timeout: 3
 bullet.topology.tick.interval.secs: 1
-bullet.rule.aggregation.raw.max.size: 500
-bullet.rule.aggregation.max.size: 1024
-bullet.rule.aggregation.count.distinct.sketch.entries: 16384
-bullet.rule.aggregation.group.sketch.entries: 1024
-bullet.rule.max.duration: 570000
+bullet.query.aggregation.raw.max.size: 500
+bullet.query.aggregation.max.size: 1024
+bullet.query.aggregation.count.distinct.sketch.entries: 16384
+bullet.query.aggregation.group.sketch.entries: 1024
+bullet.query.aggregation.distribution.sketch.entries: 1024
+bullet.query.aggregation.top.k.sketch.entries: 1024
+bullet.query.aggregation.top.k.sketch.error.type: "NFN"
+bullet.query.max.duration: 570000
 bullet.result.metadata.enable: true
 bullet.result.metadata.metrics:
-    - name: "Rule Identifier"
-      key: "rule_id"
-    - name: "Creation Time"
-      key: "rule_receive_time"
-    - name: "Termination Time"
-      key: "rule_finish_time"
-    - name: "Aggregation Metadata"
-      key: "aggregation"
+    - name: "Query Identifier"
+      key: "query_id"
+    - name: "Query Body"
+      key: "query"
+    - name: "Query Creation Time"
+      key: "query_receive_time"
+    - name: "Query Termination Time"
+      key: "query_finish_time"
+    - name: "Sketch Metadata"
+      key: "sketches"
     - name: "Estimated Result"
-      key: "wasEstimated"
+      key: "was_estimated"
     - name: "Standard Deviations"
-      key: "standardDeviations"
-    - name: "Sketch Size"
-      key: "sketchSize"
-    - name: "Sketch Theta"
-      key: "sketchTheta"
+      key: "standard_deviations"
+    - name: "Family"
+      key: "family"
+    - name: "Size"
+      key: "size"
+    - name: "Theta"
+      key: "theta"
     - name: "Uniques Estimate"
-      key: "uniquesEstimate"
+      key: "uniques_estimate"
+    - name: "Minimum Value"
+      key: "minimum_value"
+    - name: "Maximum Value"
+      key: "maximum_value"
+    - name: "Items Seen"
+      key: "items_seen"
+    - name: "Normalized Rank Error"
+      key: "normalized_rank_error"
+    - name: "Maximum Count Error"
+      key: "maximum_count_error"
+    - name: "Active Items"
+      key: "active_items"
 bullet.record.inject.timestamp.enable: true
-bullet.record.inject.timestamp.key: "__receive_timestamp"
+bullet.record.inject.timestamp.key: "receive_timestamp"

examples/web-service/example_columns.json

@@ -14,6 +14,16 @@
         "type": "LONG",
         "description": "A numeric id for the tuple generated in a monotonically increasing fashion in this period"
     },
+    {
+        "name": "duration",
+        "type": "LONG",
+        "description": "A random number ranging from 0 to 10050 with a tendency to have a high frequency on lower values"
+    },
+    {
+        "name": "type",
+        "type": "STRING",
+        "description": "A random string chosen from: foo, bar, baz, qux, quux, norf"
+    },
     {
         "name": "tags",
         "type": "MAP",