Skip to content

Revert "[hotfix] Fix druid filters" #2292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vera-liu merged 1 commit into from
Feb 28, 2017
Merged

Revert "[hotfix] Fix druid filters" #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions superset/assets/javascripts/explorev2/components/controls/Filter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import Select from 'react-select';
import { Button, Row, Col } from 'react-bootstrap';
import SelectControl from './SelectControl';

const arrayFilterOps = ['in', 'not in'];
const strFilterOps = ['==', '!=', '>', '<', '>=', '<=', 'regex'];

const propTypes = {
choices: PropTypes.array,
changeFilter: PropTypes.func,
Expand Down Expand Up @@ -58,15 +55,6 @@ export default class Filter extends React.Component {
if (event && event.value) {
value = event.value;
}
if (control === 'op') {
if (arrayFilterOps.indexOf(this.props.filter.op) !== -1
&& strFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', this.props.filter.val[0]);
} else if (strFilterOps.indexOf(this.props.filter.op) !== -1
&& arrayFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', [this.props.filter.val]);
}
}
this.props.changeFilter(control, value);
if (control === 'col' && value !== null && this.props.datasource.filter_select) {
this.fetchFilterValues(value);
Expand All @@ -82,13 +70,13 @@ export default class Filter extends React.Component {
this.fetchFilterValues(filter.col);
}
}
if (this.props.having || StrFilterOps.indexOf(filter.op) !== -1) {
// druid having filter or regex/==/!= filters
if (this.props.having) {
// druid having filter
return (
<input
type="text"
onChange={this.changeFilter.bind(this, 'val')}
value={filter.val}
value={filter.value}
className="form-control input-sm"
placeholder="Filter value"
/>
Expand Down
15 changes: 4 additions & 11 deletions superset/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,8 +1403,7 @@ def visit_column(element, compiler, **kw):
col_obj = cols.get(col)
if col_obj and op in ('in', 'not in'):
values = [types.strip("'").strip('"') for types in eq]
if col_obj.is_num:
values = [utils.js_string_to_num(s) for s in values]
values = [utils.js_string_to_num(s) for s in values]
cond = col_obj.sqla_col.in_(values)
if op == 'not in':
cond = ~cond
Expand Down Expand Up @@ -2568,7 +2567,8 @@ def increment_timestamp(ts):
query=query_str,
duration=datetime.now() - qry_start_dttm)

def get_filters(self, raw_filters):
@staticmethod
def get_filters(raw_filters):
filters = None
for flt in raw_filters:
if not all(f in flt for f in ['col', 'op', 'val']):
Expand All @@ -2577,11 +2577,6 @@ def get_filters(self, raw_filters):
op = flt['op']
eq = flt['val']
cond = None
if col in self.num_cols:
if op in ('in', 'not in'):
eq = [utils.js_string_to_num(v) for v in eq]
else:
eq = utils.js_string_to_num(eq)
if op == '==':
cond = Dimension(col) == eq
elif op == '!=':
Expand All @@ -2590,9 +2585,7 @@ def get_filters(self, raw_filters):
fields = []
# Distinguish quoted values with regular value types
values = [types.replace("'", '') for types in eq]
for val in eq:
if col in self.num_cols:
val = utils.js_string_to_num(val)
values = [utils.js_string_to_num(s) for s in values]
if len(values) > 1:
for s in values:
s = s.strip()
Expand Down