fix window start backtick issue (opensearch-project#1823) (opensearch…

…-project#1824) (cherry picked from commit c7ee338cd882f0787e1537bc3924901682df085f) (cherry picked from commit 0632d4a) Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
joshuali925 · May 6, 2024 · bf0d141 · bf0d141
1 parent 5618343
commit bf0d141
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/...ations/create_accelerations_flyout/visual_editors/materialized_view/column_expression.tsx b/...ations/create_accelerations_flyout/visual_editors/materialized_view/column_expression.tsx
@@ -115,34 +115,39 @@ export const ColumnExpression = ({
                     />
                   </EuiFormRow>
                 </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiFormRow label="Aggregation field">
-                    <EuiComboBox
-                      singleSelection={{ asPlainText: true }}
-                      options={[
-                        {
-                          label: '*',
-                          disabled: currentColumnExpressionValue.functionName !== 'count',
-                        },
-                        ...accelerationFormData.dataTableFields.map((x) => ({
-                          label: x.fieldName,
-                        })),
-                      ]}
-                      selectedOptions={[
-                        {
-                          label: currentColumnExpressionValue.functionParam,
-                        },
-                      ]}
-                      onChange={(fieldOption) =>
-                        updateColumnExpressionValue(
-                          { ...currentColumnExpressionValue, functionParam: fieldOption[0].label },
-                          index
-                        )
-                      }
-                      isClearable={false}
-                    />
-                  </EuiFormRow>
-                </EuiFlexItem>
+                {currentColumnExpressionValue.functionName !== 'window.start' && (
+                  <EuiFlexItem grow={false}>
+                    <EuiFormRow label="Aggregation field">
+                      <EuiComboBox
+                        singleSelection={{ asPlainText: true }}
+                        options={[
+                          {
+                            label: '*',
+                            disabled: currentColumnExpressionValue.functionName !== 'count',
+                          },
+                          ...accelerationFormData.dataTableFields.map((x) => ({
+                            label: x.fieldName,
+                          })),
+                        ]}
+                        selectedOptions={[
+                          {
+                            label: currentColumnExpressionValue.functionParam,
+                          },
+                        ]}
+                        onChange={(fieldOption) =>
+                          updateColumnExpressionValue(
+                            {
+                              ...currentColumnExpressionValue,
+                              functionParam: fieldOption[0].label,
+                            },
+                            index
+                          )
+                        }
+                        isClearable={false}
+                      />
+                    </EuiFormRow>
+                  </EuiFlexItem>
+                )}
               </EuiFlexGroup>
             </>
           </EuiPopover>

diff --git a/...ponents/manage/accelerations/create_accelerations_flyout/visual_editors/query_builder.tsx b/...ponents/manage/accelerations/create_accelerations_flyout/visual_editors/query_builder.tsx
@@ -148,7 +148,7 @@ const buildMaterializedViewColumns = (columnsValues: MaterializedViewColumn[]) =
         `   ${
           column.functionName !== 'window.start'
             ? `${column.functionName}(${buildMaterializedViewColumnName(column.functionParam!)})`
-            : `\`${column.functionName}\``
+            : `${column.functionName}`
         }${column.fieldAlias ? ` AS \`${column.fieldAlias}\`` : ``}`
     )
     .join(', \n');

diff --git a/test/accelerations.ts b/test/accelerations.ts
@@ -411,7 +411,7 @@ AS SELECT
    count(*) AS \`counter1\`, 
    sum(\`field2\`), 
    avg(\`field3\`) AS \`average\`, 
-   \`window.start\` AS \`start\`
+   window.start AS \`start\`
 FROM datasource.database.table
 GROUP BY TUMBLE (\`timestamp\`, '1 minute')
  WITH (