Merge pull request #1985 from metamx/FixLookupCacheKey

Change LookupExtractionFn cache key to be unique
apache · Nov 18, 2015 · e3e6159 · e3e6159
2 parents 87c43fb + 7abe999
commit e3e6159
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/processing/src/main/java/io/druid/query/extraction/ExtractionFn.java b/processing/src/main/java/io/druid/query/extraction/ExtractionFn.java
@@ -30,8 +30,8 @@
     @JsonSubTypes.Type(name = "searchQuery", value = SearchQuerySpecDimExtractionFn.class),
     @JsonSubTypes.Type(name = "javascript", value = JavascriptExtractionFn.class),
     @JsonSubTypes.Type(name = "timeFormat", value = TimeFormatExtractionFn.class),
-    @JsonSubTypes.Type(name = "lookup", value = LookupExtractionFn.class),
-    @JsonSubTypes.Type(name = "identity", value = IdentityExtractionFn.class)
+    @JsonSubTypes.Type(name = "identity", value = IdentityExtractionFn.class),
+    @JsonSubTypes.Type(name = "lookup", value = LookupExtractionFn.class)
 })
 /**
  * An ExtractionFn is a function that can be used to transform the values of a column (typically a dimension)

diff --git a/processing/src/main/java/io/druid/query/extraction/LookupExtractionFn.java b/processing/src/main/java/io/druid/query/extraction/LookupExtractionFn.java
@@ -33,7 +33,7 @@
 
 public class LookupExtractionFn extends FunctionalExtraction
 {
-  private static final byte CACHE_TYPE_ID = 0x5;
+  private static final byte CACHE_TYPE_ID = 0x7;
 
   private final LookupExtractor lookup;