Skip to content

Merge headers into 'finalResults' #39

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

Open
jrmartin wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Merge headers into 'finalResults' #39

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
14 changes: 3 additions & 11 deletions src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,9 @@ public QueryResults getResults() throws GeppettoDataSourceException
boolean first = true;
for(QueryResults result : results.keySet())
{
if(finalResults.getHeader().isEmpty())

@filippomc filippomc Jan 27, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@jrmartin why two PRs target the same piece of code? Are the both based on development or there is a sequence here? I foresee conflicts

{
finalResults.getHeader().addAll(result.getHeader());
}
else
{
if(!finalResults.getHeader().equals(result.getHeader()))
{
throw new GeppettoDataSourceException("Multiple queries were executed but they returned incompatible headers");
}
}
// Merge all headers into finalResults instead of only when is empty
finalResults.getHeader().addAll(result.getHeader());

BooleanOperator o = results.get(result);
switch(o)
{
Expand Down