[GitHub] graceguo-supercat closed pull request #4718: [Explore] including auto generated avg metrics in druid

[GitBox]

graceguo-supercat closed pull request #4718: [Explore] including auto generated 
avg metrics in druid
URL: https://github.com/apache/incubator-superset/pull/4718
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/superset/assets/javascripts/explore/components/controls/MetricsControl.jsx 
b/superset/assets/javascripts/explore/components/controls/MetricsControl.jsx
index 9a16f525a0..ffc2fe26d6 100644
--- a/superset/assets/javascripts/explore/components/controls/MetricsControl.jsx
+++ b/superset/assets/javascripts/explore/components/controls/MetricsControl.jsx
@@ -74,13 +74,8 @@ function getDefaultAggregateForColumn(column) {
   return null;
 }
 
-const autoGeneratedMetricRegex = 
/^(LONG|DOUBLE|FLOAT)?(SUM|AVG|MAX|MIN|COUNT)\([A-Z_][A-Z0-9_]*\)$/i;
-function isAutoGeneratedMetric(savedMetric) {
-  return (
-    autoGeneratedMetricRegex.test(savedMetric.expression) ||
-    autoGeneratedMetricRegex.test(savedMetric.verbose_name)
-  );
-}
+const sqlaAutoGeneratedMetricRegex = 
/^(LONG|DOUBLE|FLOAT)?(SUM|AVG|MAX|MIN|COUNT)\([A-Z_][A-Z0-9_]*\)$/i;
+const druidAutoGeneratedMetricRegex = 
/^(LONG|DOUBLE|FLOAT)?(SUM|MAX|MIN|COUNT)\([A-Z_][A-Z0-9_]*\)$/i;
 
 export default class MetricsControl extends React.PureComponent {
   constructor(props) {
@@ -90,6 +85,7 @@ export default class MetricsControl extends 
React.PureComponent {
     this.checkIfAggregateInInput = this.checkIfAggregateInInput.bind(this);
     this.optionsForSelect = this.optionsForSelect.bind(this);
     this.selectFilterOption = this.selectFilterOption.bind(this);
+    this.isAutoGeneratedMetric = this.isAutoGeneratedMetric.bind(this);
     this.optionRenderer = VirtualizedRendererWrap(option => (
       <MetricDefinitionOption option={option} />
     ), { ignoreAutogeneratedMetrics: true });
@@ -209,6 +205,13 @@ export default class MetricsControl extends 
React.PureComponent {
     });
   }
 
+  isAutoGeneratedMetric(savedMetric) {
+    if (this.props.datasourceType === 'druid') {
+      return druidAutoGeneratedMetricRegex.test(savedMetric.verbose_name);
+    }
+    return sqlaAutoGeneratedMetricRegex.test(savedMetric.expression);
+  }
+
   selectFilterOption(option, filterValue) {
     if (this.state.aggregateInInput) {
       let endIndex = filterValue.length;
@@ -220,7 +223,7 @@ export default class MetricsControl extends 
React.PureComponent {
         
(option.column_name.toLowerCase().indexOf(valueAfterAggregate.toLowerCase()) >= 
0);
     }
     return option.optionName &&
-      (!option.metric_name || !isAutoGeneratedMetric(option)) &&
+      (!option.metric_name || !this.isAutoGeneratedMetric(option)) &&
       (option.optionName.toLowerCase().indexOf(filterValue.toLowerCase()) >= 
0);
   }
 
diff --git 
a/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx 
b/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
index 346a2872cd..23c8776322 100644
--- 
a/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
+++ 
b/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
@@ -24,6 +24,7 @@ const defaultProps = {
     { metric_name: 'sum__value', expression: 'SUM(energy_usage.value)' },
     { metric_name: 'avg__value', expression: 'AVG(energy_usage.value)' },
   ],
+  datasourceType: 'sqla',
 };
 
 function setup(overrides) {
@@ -188,7 +189,7 @@ describe('MetricsControl', () => {
 
   describe('option filter', () => {
     it('includes user defined metrics', () => {
-      const { wrapper } = setup();
+      const { wrapper } = setup({ datasourceType: 'druid' });
 
       expect(!!wrapper.instance().selectFilterOption(
         {
@@ -200,6 +201,19 @@ describe('MetricsControl', () => {
       )).to.be.true;
     });
 
+    it('includes auto generated avg metrics for druid', () => {
+      const { wrapper } = setup({ datasourceType: 'druid' });
+
+      expect(!!wrapper.instance().selectFilterOption(
+        {
+          metric_name: 'a_metric',
+          optionName: 'a_metric',
+          expression: 'AVG(metric)',
+        },
+        'a',
+      )).to.be.true;
+    });
+
     it('includes columns and aggregates', () => {
       const { wrapper } = setup();
 
@@ -214,6 +228,19 @@ describe('MetricsControl', () => {
       )).to.be.true;
     });
 
+    it('excludes auto generated avg metrics for sqla', () => {
+      const { wrapper } = setup();
+
+      expect(!!wrapper.instance().selectFilterOption(
+        {
+          metric_name: 'a_metric',
+          optionName: 'a_metric',
+          expression: 'AVG(metric)',
+        },
+        'a',
+      )).to.be.false;
+    });
+
     it('excludes auto generated metrics', () => {
       const { wrapper } = setup();
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services