Merge pull request #14 from h2oai/tomasz/always-include-rollup

Always include rollup field
h2oai · Jan 15, 2024 · c5c372f · c5c372f
2 parents aaa0d22 + dd3e4a6
commit c5c372f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/common_spec_types.go b/common_spec_types.go
@@ -148,7 +148,7 @@ type GranularitySpec struct {
 	Type               string                `json:"type"`
 	SegmentGranularity string                `json:"segmentGranularity,omitempty"`
 	QueryGranularity   *QueryGranularitySpec `json:"queryGranularity,omitempty"`
-	Rollup             bool                  `json:"rollup,omitempty"`
+	Rollup             bool                  `json:"rollup"`
 	Intervals          []string              `json:"intervals,omitempty"`
 }
 

diff --git a/supervisor_types_test.go b/supervisor_types_test.go
@@ -80,7 +80,8 @@ var jsonBasic = `{
         "granularitySpec": {
 			"type": "uniform",
             "segmentGranularity": "DAY",
-            "queryGranularity":  "none"
+            "queryGranularity":  "none",
+            "rollup": false
         }
     },
     "ioConfig": {
@@ -151,7 +152,8 @@ var jsonWithTypedDimensions = `{
         "granularitySpec": {
 			"type": "uniform",
             "segmentGranularity": "DAY",
-            "queryGranularity": "none"
+            "queryGranularity": "none",
+            "rollup": false
         }
     },
     "ioConfig": {
@@ -209,7 +211,8 @@ var jsonWithSqlInputSource = `{
         "granularitySpec": {
 			"type": "uniform",
 			"segmentGranularity": "DAY",
-            "queryGranularity": "none"
+            "queryGranularity": "none",
+            "rollup": false
         }
     },
     "ioConfig": {