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

Merge pull request #2343 from gianm/fix-lookups 

Fix a couple of problems with lookups
This commit is contained in:
Slim 2016-01-27 10:34:11 -06:00
parent cac675351e b1e6c01762
commit abf2f457b1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/namespace-lookup/src/main/java/io/druid/query/extraction/NamespacedExtractor.java
View File

@ -49,7 +49,7 @@ public class NamespacedExtractor extends LookupExtractor
public NamespacedExtractor( public NamespacedExtractor(
@NotNull @JacksonInject @Named("dimExtractionNamespace") @NotNull @JacksonInject @Named("dimExtractionNamespace")
final Function<String, Function<String, String>> namespaces, final Function<String, Function<String, String>> namespaces,
@NotNull @JacksonInject @Named("reverseDimExtractionNamespace") @NotNull @JacksonInject @Named("dimReverseExtractionNamespace")
final Function<String, Function<String, List<String>>> reverseNamespaces, final Function<String, Function<String, List<String>>> reverseNamespaces,
@NotNull @JsonProperty(value = "namespace", required = true) @NotNull @JsonProperty(value = "namespace", required = true)
final String namespace final String namespace

8
processing/src/main/java/io/druid/query/extraction/LookupExtractor.java
View File

@ -44,7 +44,7 @@ public abstract class LookupExtractor
* @return The lookup, or null key cannot have the lookup applied to it and should be treated as missing. * @return The lookup, or null key cannot have the lookup applied to it and should be treated as missing.
*/ */
@Nullable @Nullable
abstract String apply(@NotNull String key); public abstract String apply(@NotNull String key);
/** /**
* @param keys set of keys to apply lookup for each element * @param keys set of keys to apply lookup for each element
@ -54,7 +54,7 @@ public abstract class LookupExtractor
* User can override this method if there is a better way to perform bulk lookup * User can override this method if there is a better way to perform bulk lookup
*/ */
Map<String, String> applyAll(Iterable<String> keys) public Map<String, String> applyAll(Iterable<String> keys)
{ {
if (keys == null) { if (keys == null) {
return Collections.emptyMap(); return Collections.emptyMap();
@ -88,7 +88,7 @@ public abstract class LookupExtractor
* User can override this method if there is a better way to perform bulk reverse lookup * User can override this method if there is a better way to perform bulk reverse lookup
*/ */
Map<String, List<String>> unapplyAll(Iterable<String> values) public Map<String, List<String>> unapplyAll(Iterable<String> values)
{ {
if (values == null) { if (values == null) {
return Collections.emptyMap(); return Collections.emptyMap();
@ -107,5 +107,5 @@ public abstract class LookupExtractor
*/ */
@Nullable @Nullable
abstract byte[] getCacheKey(); public abstract byte[] getCacheKey();
} }