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.

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

Fix DataSource::getNames. #125

Merged
merged 1 commit into from
Dec 15, 2016
Merged

Fix DataSource::getNames. #125

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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ Current

### Fixed:

- [`DataSource::getNames` now returns Fili identifiers, not fact store identifiers](https://github.com/yahoo/fili/pull/125/files)

- [Fix and refactor role based filter to allow CORS](https://github.com/yahoo/fili/pull/99)
* Fix `RoleBasedAuthFilter` to bypass `OPTIONS` request for CORS
* Discovered a bug where `user_roles` is declared but unset still reads as a list with empty string (included a temporary fix by commenting the variable declaration)
Expand Down
7 changes: 6 additions & 1 deletion fili-core/src/main/java/com/yahoo/bard/webservice/druid/model/datasource/DataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,17 @@ public Set<PhysicalTable> getPhysicalTables() {
return physicalTables;
}

/**
* Returns a set of identifiers used by Fili to identify this data source's physical tables.
*
* @return The set of names used by Fili to identify this data source's physical tables
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public Set<String> getNames() {
return Collections.unmodifiableSet(
getPhysicalTables()
.stream()
.map(PhysicalTable::getFactTableName)
.map(PhysicalTable::getName)
.collect(Collectors.toSet())
);
}
Expand Down