pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 00:29:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: count(distinct column_name) in metrics (#19842)

Browse Source
This commit is contained in:
Yongjie Zhao 2022-04-26 20:03:55 +08:00 committed by GitHub
parent e632b82395
commit 25e572a56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.js
View File

@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
import { sqlaAutoGeneratedMetricRegex } from 'src/explore/constants';
import {
sqlaAutoGeneratedMetricRegex,
AGGREGATES,
} from 'src/explore/constants';
export const EXPRESSION_TYPES = {
SIMPLE: 'SIMPLE',
@ -86,20 +89,30 @@ export default class AdhocMetric {
}
getDefaultLabel() {
const label = this.translateToSql(true);
const label = this.translateToSql({ useVerboseName: true });
return label.length < 43 ? label : `${label.substring(0, 40)}...`;
}
translateToSql(useVerboseName = false) {
translateToSql(
params = { useVerboseName: false, transformCountDistinct: false },
) {
if (this.expressionType === EXPRESSION_TYPES.SIMPLE) {
const aggregate = this.aggregate || '';
// eslint-disable-next-line camelcase
const column =
useVerboseName && this.column?.verbose_name
params.useVerboseName && this.column?.verbose_name
? `(${this.column.verbose_name})`
: this.column?.column_name
? `(${this.column.column_name})`
: '';
// transform from `count_distinct(column)` to `count(distinct column)`
if (
params.transformCountDistinct &&
aggregate === AGGREGATES.COUNT_DISTINCT &&
/^\(.*\)$/.test(column)
) {
return `COUNT(DISTINCT ${column.slice(1, -1)})`;
}
return aggregate + column;
}
if (this.expressionType === EXPRESSION_TYPES.SQL) {

36
superset-frontend/src/explore/components/controls/MetricControl/AdhocMetric.test.js
View File

@ -216,4 +216,40 @@ describe('AdhocMetric', () => {
expect(adhocMetric3.aggregate).toBe(AGGREGATES.AVG);
expect(adhocMetric3.column.column_name).toBe('value');
});
it('should transform count_distinct SQL and do not change label if does not set metric label', () => {
const withBrackets = new AdhocMetric({
column: { type: 'TEXT', column_name: '(column-with-barckets)' },
aggregate: AGGREGATES.COUNT_DISTINCT,
hasCustomLabel: false,
});
expect(withBrackets.translateToSql({ transformCountDistinct: true })).toBe(
'COUNT(DISTINCT (column-with-barckets))',
);
expect(withBrackets.getDefaultLabel()).toBe(
'COUNT_DISTINCT((column-with-barckets))',
);
const withoutBrackets = new AdhocMetric({
column: { type: 'TEXT', column_name: 'column-without-barckets' },
aggregate: AGGREGATES.COUNT_DISTINCT,
hasCustomLabel: false,
});
expect(
withoutBrackets.translateToSql({ transformCountDistinct: true }),
).toBe('COUNT(DISTINCT column-without-barckets)');
expect(withoutBrackets.getDefaultLabel()).toBe(
'COUNT_DISTINCT(column-without-barckets)',
);
const emptyColumnName = new AdhocMetric({
column: { type: 'TEXT', column_name: '' },
aggregate: AGGREGATES.COUNT_DISTINCT,
hasCustomLabel: false,
});
expect(
emptyColumnName.translateToSql({ transformCountDistinct: true }),
).toBe('COUNT_DISTINCT');
expect(emptyColumnName.getDefaultLabel()).toBe('COUNT_DISTINCT');
});
});

5
superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
View File

@ -465,7 +465,10 @@ export default class AdhocMetricEditPopover extends React.PureComponent {
onChange={this.onSqlExpressionChange}
width="100%"
showGutter={false}
value={adhocMetric.sqlExpression || adhocMetric.translateToSql()}
value={
adhocMetric.sqlExpression ||
adhocMetric.translateToSql({ transformCountDistinct: true })
}
editorProps={{ $blockScrolling: true }}
enableLiveAutocompletion
className="filter-sql-editor"