This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new faf3f1e Fix cache keys of DefaultDimensionSpec and
ExtractionDimensionSpec (#6390)
faf3f1e is described below
commit faf3f1e426ef9cda2e584c78c13e9e93c92630a0
Author: Jihoon Son <[email protected]>
AuthorDate: Wed Sep 26 20:08:53 2018 -0700
Fix cache keys of DefaultDimensionSpec and ExtractionDimensionSpec (#6390)
---
.../druid/query/dimension/DefaultDimensionSpec.java | 13 +++++--------
.../druid/query/dimension/ExtractionDimensionSpec.java | 17 ++++++-----------
.../druid/query/dimension/DefaultDimensionSpecTest.java | 8 ++++++++
.../query/dimension/ExtractionDimensionSpecTest.java | 14 ++++++++++++++
4 files changed, 33 insertions(+), 19 deletions(-)
diff --git
a/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java
b/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java
index 9f8e27a..b948f6e 100644
---
a/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java
+++
b/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java
@@ -24,12 +24,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.cache.CacheKeyBuilder;
import org.apache.druid.query.extraction.ExtractionFn;
import org.apache.druid.segment.DimensionSelector;
import org.apache.druid.segment.column.ValueType;
-import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
@@ -132,12 +131,10 @@ public class DefaultDimensionSpec implements DimensionSpec
@Override
public byte[] getCacheKey()
{
- byte[] dimensionBytes = StringUtils.toUtf8(dimension);
-
- return ByteBuffer.allocate(1 + dimensionBytes.length)
- .put(CACHE_TYPE_ID)
- .put(dimensionBytes)
- .array();
+ return new CacheKeyBuilder(CACHE_TYPE_ID)
+ .appendString(dimension)
+ .appendString(outputType.toString())
+ .build();
}
@Override
diff --git
a/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java
b/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java
index 6a14a9f..7188506 100644
---
a/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java
+++
b/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java
@@ -22,13 +22,11 @@ package org.apache.druid.query.dimension;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.cache.CacheKeyBuilder;
import org.apache.druid.query.extraction.ExtractionFn;
import org.apache.druid.segment.DimensionSelector;
import org.apache.druid.segment.column.ValueType;
-import java.nio.ByteBuffer;
-
/**
*/
public class ExtractionDimensionSpec implements DimensionSpec
@@ -114,14 +112,11 @@ public class ExtractionDimensionSpec implements
DimensionSpec
@Override
public byte[] getCacheKey()
{
- byte[] dimensionBytes = StringUtils.toUtf8(dimension);
- byte[] dimExtractionFnBytes = extractionFn.getCacheKey();
-
- return ByteBuffer.allocate(1 + dimensionBytes.length +
dimExtractionFnBytes.length)
- .put(CACHE_TYPE_ID)
- .put(dimensionBytes)
- .put(dimExtractionFnBytes)
- .array();
+ return new CacheKeyBuilder(CACHE_TYPE_ID)
+ .appendString(dimension)
+ .appendCacheable(extractionFn)
+ .appendString(outputType.toString())
+ .build();
}
@Override
diff --git
a/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java
b/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java
index ba7ae52..c0a251c 100644
---
a/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java
+++
b/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java
@@ -55,4 +55,12 @@ public class DefaultDimensionSpecTest
Assert.assertEquals(spec, other);
Assert.assertEquals(spec.hashCode(), other.hashCode());
}
+
+ @Test
+ public void testCacheKey()
+ {
+ final DimensionSpec spec = new DefaultDimensionSpec("foo", "foo",
ValueType.FLOAT);
+ final byte[] expected = new byte[] {0, 7, 102, 111, 111, 7, 70, 76, 79,
65, 84};
+ Assert.assertArrayEquals(expected, spec.getCacheKey());
+ }
}
diff --git
a/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java
b/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java
index e428d41..4536562 100644
---
a/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java
+++
b/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.query.extraction.MatchingDimExtractionFn;
import org.apache.druid.query.extraction.RegexDimExtractionFn;
+import org.apache.druid.query.extraction.StrlenExtractionFn;
import org.apache.druid.segment.column.ValueType;
import org.junit.Assert;
import org.junit.Test;
@@ -144,4 +145,17 @@ public class ExtractionDimensionSpecTest
.getExtractionFn() instanceof MatchingDimExtractionFn
);
}
+
+ @Test
+ public void testCacheKey()
+ {
+ final ExtractionDimensionSpec dimensionSpec = new ExtractionDimensionSpec(
+ "foo",
+ "len",
+ ValueType.LONG,
+ StrlenExtractionFn.instance()
+ );
+ final byte[] expected = new byte[]{1, 7, 102, 111, 111, 9, 14, 7, 76, 79,
78, 71};
+ Assert.assertArrayEquals(expected, dimensionSpec.getCacheKey());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
