Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VirtualColumns: Block virtual columns with empty names. (#4367) 

* VirtualColumns: Block virtual columns with empty names.

* Spelling.
This commit is contained in:
Gian Merlino 2017-06-06 08:05:47 -07:00 committed by GitHub
parent 152d4e89ab
commit d22db30db4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
processing/src/main/java/io/druid/segment/VirtualColumns.java
View File

@ -22,6 +22,7 @@ package io.druid.segment;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -46,9 +47,9 @@ import java.util.Set;
public class VirtualColumns implements Cacheable public class VirtualColumns implements Cacheable
{ {
public static final VirtualColumns EMPTY = new VirtualColumns( public static final VirtualColumns EMPTY = new VirtualColumns(
ImmutableList.<VirtualColumn>of(), ImmutableList.of(),
ImmutableMap.<String, VirtualColumn>of(), ImmutableMap.of(),
ImmutableMap.<String, VirtualColumn>of() ImmutableMap.of()
); );
/** /**
@ -78,6 +79,10 @@ public class VirtualColumns implements Cacheable
Map<String, VirtualColumn> withDotSupport = Maps.newHashMap(); Map<String, VirtualColumn> withDotSupport = Maps.newHashMap();
Map<String, VirtualColumn> withoutDotSupport = Maps.newHashMap(); Map<String, VirtualColumn> withoutDotSupport = Maps.newHashMap();
for (VirtualColumn vc : virtualColumns) { 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)) { if (vc.getOutputName().equals(Column.TIME_COLUMN_NAME)) {
throw new IAE("virtualColumn name[%s] not allowed", vc.getOutputName()); throw new IAE("virtualColumn name[%s] not allowed", vc.getOutputName());
} }