feat: Add additional MV granularity options

Author: pulpdrew

.changeset/purple-bats-smile.md

@@ -0,0 +1,6 @@
+---
+"@hyperdx/api": patch
+"@hyperdx/app": patch
+---
+
+feat: Add MV granularities and infer config from SummingMergeTree

packages/app/src/components/SourceForm.tsx

@@ -57,6 +57,7 @@ import {
 import {
   inferMaterializedViewConfig,
   MV_AGGREGATE_FUNCTIONS,
+  MV_GRANULARITY_OPTIONS,
 } from '@/utils/materializedViews';
 
 import ConfirmDeleteMenu from './ConfirmDeleteMenu';
@@ -69,15 +70,6 @@ import { SQLInlineEditorControlled } from './SQLInlineEditor';
 
 const DEFAULT_DATABASE = 'default';
 
-const MV_GRANULARITY_OPTIONS = [
-  { value: '1 second', label: '1 second' },
-  { value: '1 minute', label: '1 minute' },
-  { value: '5 minute', label: '5 minutes' },
-  { value: '15 minute', label: '15 minutes' },
-  { value: '1 hour', label: '1 hour' },
-  { value: '1 day', label: '1 day' },
-];
-
 const MV_AGGREGATE_FUNCTION_OPTIONS = MV_AGGREGATE_FUNCTIONS.map(fn => ({
   value: fn,
   label: fn,
@@ -551,12 +543,14 @@ function AggregatedColumnsFormSection({
               replaceAggregates(config.aggregatedColumns ?? []);
               notifications.show({
                 color: 'green',
+                id: 'mv-infer-success',
                 message:
                   'Partially inferred materialized view configuration from view schema.',
               });
             } else {
               notifications.show({
                 color: 'yellow',
+                id: 'mv-infer-failure',
                 message: 'Unable to infer materialized view configuration.',
               });
             }

packages/app/src/utils/__tests__/materializedViews.test.ts

@@ -446,7 +446,12 @@ describe('inferTimestampColumnGranularity', () => {
     {
       expected: '5 minute',
       asSelect:
-        'SELECT toStartOfInterval(Timestamp, interval 5 minute) AS Timestamp, ServiceName, quantileState(0.9)(Duration) AS p90__Duration FROM default.otel_traces GROUP BY Timestamp, ServiceName',
+        'SELECT toStartOfInterval(Timestamp, interval 5 minutes) AS Timestamp, ServiceName, quantileState(0.9)(Duration) AS p90__Duration FROM default.otel_traces GROUP BY Timestamp, ServiceName',
+    },
+    {
+      expected: '30 minute',
+      asSelect:
+        'SELECT toStartOfInterval(Timestamp, toIntervalMinute(30)) AS Timestamp, ServiceName, quantileState(0.9)(Duration) AS p90__Duration FROM default.otel_traces GROUP BY Timestamp, ServiceName',
     },
   ])(
     'should handle a toStartOfInterval function with a dynamic interval: $expected',

packages/app/src/utils/materializedViews.ts

@@ -7,7 +7,10 @@ import {
   TableConnection,
   TableMetadata,
 } from '@hyperdx/common-utils/dist/core/metadata';
-import { splitAndTrimWithBracket } from '@hyperdx/common-utils/dist/core/utils';
+import {
+  Granularity,
+  splitAndTrimWithBracket,
+} from '@hyperdx/common-utils/dist/core/utils';
 import {
   InternalAggregateFunction,
   MaterializedViewConfiguration,
@@ -25,6 +28,36 @@ export const MV_AGGREGATE_FUNCTIONS = [
   'histogram',
 ];
 
+/**
+ * To maximize the number of queries which are compatible with materialized views,
+ * every granularity should be a multiple of every smaller granularity.
+ *
+ * Further, these should match the granularities supported by charts, defined
+ * in convertDateRangeToGranularityString().
+ * */
+export const MV_GRANULARITY_OPTIONS = [
+  { value: Granularity.FifteenSecond, label: '15 seconds' },
+  { value: Granularity.ThirtySecond, label: '30 seconds' },
+  { value: Granularity.OneMinute, label: '1 minute' },
+  { value: Granularity.FiveMinute, label: '5 minutes' },
+  { value: Granularity.FifteenMinute, label: '15 minutes' },
+  { value: Granularity.ThirtyMinute, label: '30 minutes' },
+  { value: Granularity.OneHour, label: '1 hour' },
+  { value: Granularity.TwoHour, label: '2 hours' },
+  { value: Granularity.SixHour, label: '6 hours' },
+  { value: Granularity.TwelveHour, label: '12 hours' },
+  { value: Granularity.OneDay, label: '1 day' },
+  { value: Granularity.TwoDay, label: '2 days' },
+  { value: Granularity.SevenDay, label: '7 days' },
+  { value: Granularity.ThirtyDay, label: '30 days' },
+];
+
+const isGranularity = (value: string): value is Granularity => {
+  return MV_GRANULARITY_OPTIONS.map(option => option.value as string).includes(
+    value,
+  );
+};
+
 const MV_DDL_PATTERN = /MATERIALIZED VIEW [^\s]+\.[^\s]+ TO ([^\s]+)\.([^\s]+)/;
 function getViewTargetTable(meta: TableMetadata) {
   const match = meta.create_table_query.match(MV_DDL_PATTERN);
@@ -183,14 +216,20 @@ export function inferTimestampColumnGranularity(
     // Only accept specific granularities matching the ones defined above
     if (timestampExpression.includes(`toStartOfInterval(`)) {
       const intervalMatch = timestampExpression.match(
-        /INTERVAL\s+(\d+)\s+(SECOND|MINUTE|HOUR|DAY)\)/i,
+        /INTERVAL\s+(\d+)\s+(SECOND|MINUTE|HOUR|DAY)S?\)/i,
+      );
+      const intervalFunctionMatch = timestampExpression.match(
+        /toInterval(Second|Minute|Hour|Day)\((\d+)\)/,
       );
       const granularity = intervalMatch
         ? `${intervalMatch[1]} ${intervalMatch[2].toLowerCase()}`
-        : '';
+        : intervalFunctionMatch
+          ? `${intervalFunctionMatch[2]} ${intervalFunctionMatch[1].toLowerCase()}`
+          : null;
       if (
         granularity &&
-        Object.values(intervalToGranularityMap).includes(granularity)
+        isGranularity(granularity) &&
+        MV_GRANULARITY_OPTIONS.map(option => option.value).includes(granularity)
       ) {
         return granularity;
       }