Skip to content

InDimFilter: Fix cache key computation to avoid collisions. #11168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gianm merged 2 commits into from
Apr 29, 2021
Merged

InDimFilter: Fix cache key computation to avoid collisions. #11168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ee647
InDimFilter: Fix cache key computation to avoid collisions.
gianm Apr 27, 2021
a8d0908
Merge branch 'master' into fix-in-filter-cache-key
gianm Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,18 @@ private byte[] computeCacheKey()
sortedValues = sortedValuesList;
}

// Hash all values, in sorted order, as their length followed by their content.
final Hasher hasher = Hashing.sha256().newHasher();
for (String v : sortedValues) {
if (v == null) {
hasher.putInt(0);
// Encode null as length -1, no content.
hasher.putInt(-1);
} else {
hasher.putInt(v.length());
hasher.putString(v, StandardCharsets.UTF_8);
}
}

return new CacheKeyBuilder(DimFilterUtils.IN_CACHE_ID)
.appendString(dimension)
.appendByte(DimFilterUtils.STRING_SEPARATOR)
Expand Down
29 changes: 29 additions & 0 deletions processing/src/test/java/org/apache/druid/query/filter/InDimFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ public void testGetCacheKeyReturningSameKeyForValuesOfDifferentOrders()
Assert.assertArrayEquals(dimFilter1.getCacheKey(), dimFilter2.getCacheKey());
}

@Test
public void testGetCacheKeyForNullVsEmptyString()
{
final InDimFilter inDimFilter1 = new InDimFilter("dimTest", Arrays.asList(null, "abc"), null);
final InDimFilter inDimFilter2 = new InDimFilter("dimTest", Arrays.asList("", "abc"), null);

if (NullHandling.sqlCompatible()) {
Assert.assertFalse(Arrays.equals(inDimFilter1.getCacheKey(), inDimFilter2.getCacheKey()));
} else {
Assert.assertArrayEquals(inDimFilter1.getCacheKey(), inDimFilter2.getCacheKey());
}
}

@Test
public void testGetCacheKeyReturningSameKeyForSetsOfDifferentTypesAndComparators()
{
Expand All @@ -119,6 +132,22 @@ public void testGetCacheKeyDifferentKeysForListOfStringsAndSingleStringOfLists()
Assert.assertFalse(Arrays.equals(inDimFilter1.getCacheKey(), inDimFilter2.getCacheKey()));
}

@Test
public void testGetCacheKeyDifferentKeysForNullAndFourZeroChars()
{
final InDimFilter inDimFilter1 = new InDimFilter("dimTest", Arrays.asList(null, "abc"), null);
final InDimFilter inDimFilter2 = new InDimFilter("dimTest", Arrays.asList("\0\0\0\0", "abc"), null);
Assert.assertFalse(Arrays.equals(inDimFilter1.getCacheKey(), inDimFilter2.getCacheKey()));
}

@Test
public void testGetCacheKeyDifferentKeysWhenStringBoundariesMove()
{
final InDimFilter inDimFilter1 = new InDimFilter("dimTest", Arrays.asList("bar", "foo"), null);
final InDimFilter inDimFilter2 = new InDimFilter("dimTest", Arrays.asList("barf", "oo"), null);
Assert.assertFalse(Arrays.equals(inDimFilter1.getCacheKey(), inDimFilter2.getCacheKey()));
}

@Test
public void testGetCacheKeyDifferentKeysForListOfStringsAndSingleStringOfListsWithExtractFn()
{
Expand Down