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

fix #1727 - Union bySegment queries fix #1730

Merged
merged 1 commit into from
Sep 29, 2015

Conversation

nishantmonu51
Copy link
Member

Fixes #1727
revert to doing merging for results for union queries on broker.
Historical node will throw Unsupported Exception for Union Queries sent directly to it.

@xvrl
Copy link
Member

xvrl commented Sep 14, 2015

@nishantmonu51 I think you mean to say fix #1727, not 1721. I fixed the description, but might want to fix commit message as well

@nishantmonu51 nishantmonu51 changed the title fix #1721 fix #1727 Sep 15, 2015
@nishantmonu51
Copy link
Member Author

Ah, updated the commit message and PR description to have correct message.

@drcrallen
Copy link
Contributor

weird failure on that one:

AnnouncerTest.testSessionKilled:157 expected null, but was:<10,10,1442324913450,1442324913450,0,0,0,94524205367558145,25,0,10>

@@ -150,12 +151,12 @@ public int postEventsFromFile(String file)
? MediaType.APPLICATION_JSON
: SmileMediaTypes.APPLICATION_JACKSON_SMILE;
totalEventsPosted += postEvents(events, mapper, mediaType);
;
expectedEvents += events.size();
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this related to the rest of the PR?

Copy link
Member Author

Choose a reason for hiding this comment

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

not related to this PR, it was an integration-test issue, that popped up when i tried to run integration-tests. will separate test fix in a separate PR.

@gianm
Copy link
Contributor

gianm commented Sep 15, 2015

Looks good although is it possible to add a regression test?

@nishantmonu51
Copy link
Member Author

@gianm cant add test for the exact same bug since it was in the code path that is now removed.
Added test for UnionQueryRunner that verifies its functionality.

@xvrl
Copy link
Member

xvrl commented Sep 22, 2015

@nishantmonu51 looks like one of the unit test is actually failing

@nishantmonu51 nishantmonu51 force-pushed the union-queries-fix branch 2 times, most recently from 90df05a to c720f1e Compare September 22, 2015 22:28
@nishantmonu51
Copy link
Member Author

Ah, i screwed up while squashing commits for a renamed file, should be fixed now.

@fjy
Copy link
Contributor

fjy commented Sep 23, 2015

👍

@drcrallen
Copy link
Contributor

In a world where I have only one broker and one historical, the desired behavior is that if I submit a query to the broker I get the same result as if I submit it to the historical. Does this break that behavior?

@nishantmonu51
Copy link
Member Author

After this change, historical nodes will not be aware of how to run union queries.
you will need to send the query to broker always.
there are alternative approaches where we can make this working for historical nodes too. (discussed here - #1727)

@drcrallen
Copy link
Contributor

Can you update the docs for http://druid.io/docs/latest/querying/datasource.html to indicate the limitations of the Union Query being issued against a broker?

@cheddar
Copy link
Contributor

cheddar commented Sep 29, 2015

We talked about this in the dev sync and while it is unfortunate that historicals won't know about the Union query, it is probably the least of evils at this point in time, so I'm 👍 on that aspect (haven't actually verified the code)

Can we update this PR to have a more meaningful name though? ;)

Fixes apache#1727.
revert to doing merging for results for union queries on broker.

revert unrelated changes

Add test for union query runner

Add test

remove unused imports

fix imports

fix renamed file

fix test

update docs.
@nishantmonu51 nishantmonu51 changed the title fix #1727 fix #1727 - Union bySegment queries fix Sep 29, 2015
@nishantmonu51
Copy link
Member Author

updated the docs and the PR name.

drcrallen added a commit that referenced this pull request Sep 29, 2015
@drcrallen drcrallen merged commit 2d847ad into apache:master Sep 29, 2015
@drcrallen drcrallen deleted the union-queries-fix branch September 29, 2015 19:23
@drcrallen
Copy link
Contributor

Encountered error during rollout internally related to historicals getting union queries. Investigating more, but this might require BROKERs to be updated before HISTORICALs for 0.8.2

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.

None yet

6 participants