Skip to content
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.

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

This restores the old time range behavior #8771

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

jsternberg
Copy link
Contributor

@jsternberg jsternberg commented Aug 31, 2017

All time ranges are combined with AND regardless of context and
regardless of whether it makes any logical sense.

That was the previous behavior and, unfortunately, a lot of people rely
on it.

  • Rebased/mergable
  • Tests pass
  • CHANGELOG.md updated

This change modifies the changelog for #8712.

@jsternberg jsternberg force-pushed the js-restore-old-timerange-behavior branch 2 times, most recently from 6addea9 to 3cd7007 Compare August 31, 2017 16:12
@jsternberg jsternberg requested review from rbetts and benbjohnson and removed request for rbetts August 31, 2017 17:09
@@ -145,7 +145,7 @@ func TestCompile_Failures(t *testing.T) {
{s: `SELECT bottom(value, 2.5) FROM cpu`, err: `expected integer as last argument in bottom(), found 2.500`},
{s: `SELECT bottom(value, -1) FROM cpu`, err: `limit (-1) in bottom function must be at least 1`},
{s: `SELECT bottom(value, 3) FROM cpu LIMIT 2`, err: `limit (3) in bottom function can not be larger than the LIMIT (2) in the select statement`},
{s: `SELECT value FROM cpu WHERE time >= now() - 10m OR time < now() - 5m`, err: `cannot use OR with time conditions`},
//{s: `SELECT value FROM cpu WHERE time >= now() - 10m OR time < now() - 5m`, err: `cannot use OR with time conditions`},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you either remove this line or add a comment about why it's commented out?

All time ranges are combined with AND regardless of context and
regardless of whether it makes any logical sense.

That was the previous behavior and, unfortunately, a lot of people rely
on it.
@jsternberg jsternberg force-pushed the js-restore-old-timerange-behavior branch from 3cd7007 to c8440b4 Compare September 14, 2017 14:10
@jsternberg jsternberg merged commit 6e60edc into master Sep 14, 2017
@jsternberg jsternberg deleted the js-restore-old-timerange-behavior branch September 14, 2017 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants