Skip to content

VirtualColumns: Block virtual columns with empty names. #4367

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
gianm merged 2 commits into from
Jun 6, 2017
Merged

VirtualColumns: Block virtual columns with empty names. #4367

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1263e6
VirtualColumns: Block virtual columns with empty names.
gianm Jun 6, 2017
6a8e101
Spelling.
gianm Jun 6, 2017
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
11 changes: 8 additions & 3 deletions processing/src/main/java/io/druid/segment/VirtualColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
Expand All @@ -46,9 +47,9 @@
public class VirtualColumns implements Cacheable
{
public static final VirtualColumns EMPTY = new VirtualColumns(
ImmutableList.<VirtualColumn>of(),
ImmutableMap.<String, VirtualColumn>of(),
ImmutableMap.<String, VirtualColumn>of()
ImmutableList.of(),
ImmutableMap.of(),
ImmutableMap.of()
);

/**
Expand Down Expand Up @@ -78,6 +79,10 @@ public static VirtualColumns create(List<VirtualColumn> virtualColumns)
Map<String, VirtualColumn> withDotSupport = Maps.newHashMap();
Map<String, VirtualColumn> withoutDotSupport = Maps.newHashMap();
for (VirtualColumn vc : virtualColumns) {
if (Strings.isNullOrEmpty(vc.getOutputName())) {
throw new IAE("Empty or null virtualColumn name");
}

if (vc.getOutputName().equals(Column.TIME_COLUMN_NAME)) {
throw new IAE("virtualColumn name[%s] not allowed", vc.getOutputName());
}
Expand Down