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

Separate ListColumnIncluderator cache key parts with nul bytes

This commit is contained in:
Gian Merlino 2015-09-28 21:17:44 -04:00
parent 25bbc0b923
commit 62d4ced4dd
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java
View File

@ -64,12 +64,13 @@ public class ListColumnIncluderator implements ColumnIncluderator
for (String column : this.columns) {
final byte[] bytes = StringUtils.toUtf8(column);
columns.add(bytes);
size += bytes.length;
size += bytes.length + 1;
}
final ByteBuffer bytes = ByteBuffer.allocate(size).put(LIST_CACHE_PREFIX);
for (byte[] column : columns) {
bytes.put(column);
bytes.put((byte) 0xff);
}
return bytes.array();

22
processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java
View File

@ -375,4 +375,26 @@ public class SegmentMetadataQueryTest
Assert.assertEquals(expectedSegments2.get(i).getInterval(), filteredSegments2.get(i).getInterval());
}
}
@Test
public void testCacheKeyWithListColumnIncluderator()
{
SegmentMetadataQuery oneColumnQuery = Druids.newSegmentMetadataQueryBuilder()
.dataSource("testing")
.toInclude(new ListColumnIncluderator(Arrays.asList("foo")))
.build();
SegmentMetadataQuery twoColumnQuery = Druids.newSegmentMetadataQueryBuilder()
.dataSource("testing")
.toInclude(new ListColumnIncluderator(Arrays.asList("fo", "o")))
.build();
final byte[] oneColumnQueryCacheKey = new SegmentMetadataQueryQueryToolChest(null).getCacheStrategy(oneColumnQuery)
.computeCacheKey(oneColumnQuery);
final byte[] twoColumnQueryCacheKey = new SegmentMetadataQueryQueryToolChest(null).getCacheStrategy(twoColumnQuery)
.computeCacheKey(twoColumnQuery);
Assert.assertFalse(Arrays.equals(oneColumnQueryCacheKey, twoColumnQueryCacheKey));
}
}