mirror of https://github.com/apache/druid.git
fix caching for search results (#3119)
* fix caching for search results properly read count when reading from cache. * fix NPE during merging search count and add test * Update cache key to invalidate prev results
This commit is contained in:
Nishant
Charles Allen
parent
c2155e13bd
commit
0d427923c0
|
|
@ -86,12 +86,17 @@ public class SearchBinaryFn
|
|||
continue;
|
||||
}
|
||||
if (prev.equals(searchHit)) {
|
||||
if (prev.getCount() != null) {
|
||||
if (prev.getCount() != null && searchHit.getCount() != null) {
|
||||
prev = new SearchHit(
|
||||
prev.getDimension(),
|
||||
prev.getValue(),
|
||||
prev.getCount() + searchHit.getCount()
|
||||
);
|
||||
} else {
|
||||
prev = new SearchHit(
|
||||
prev.getDimension(),
|
||||
prev.getValue()
|
||||
);
|
||||
}
|
||||
} else {
|
||||
results.add(prev);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ import java.util.Map;
|
|||
*/
|
||||
public class SearchQueryQueryToolChest extends QueryToolChest<Result<SearchResultValue>, SearchQuery>
|
||||
{
|
||||
private static final byte SEARCH_QUERY = 0x2;
|
||||
private static final byte SEARCH_QUERY = 0x15;
|
||||
private static final TypeReference<Result<SearchResultValue>> TYPE_REFERENCE = new TypeReference<Result<SearchResultValue>>()
|
||||
{
|
||||
};
|
||||
|
|
@ -221,8 +221,9 @@ public class SearchQueryQueryToolChest extends QueryToolChest<Result<SearchResul
|
|||
{
|
||||
if (input instanceof Map) {
|
||||
return new SearchHit(
|
||||
(String) ((Map) input).get("dimension"),
|
||||
(String) ((Map) input).get("value")
|
||||
(String) ((Map) input).get("dimension"),
|
||||
(String) ((Map) input).get("value"),
|
||||
(Integer) ((Map) input).get("count")
|
||||
);
|
||||
} else if (input instanceof SearchHit) {
|
||||
return (SearchHit) input;
|
||||
|
|
|
|||
|
|
@ -41,12 +41,15 @@ public class SearchBinaryFnTest
|
|||
{
|
||||
private final DateTime currTime = new DateTime();
|
||||
|
||||
private void assertSearchMergeResult(Object o1, Object o2)
|
||||
private void assertSearchMergeResult(SearchResultValue o1, SearchResultValue o2)
|
||||
{
|
||||
Iterator i1 = ((Iterable) o1).iterator();
|
||||
Iterator i2 = ((Iterable) o2).iterator();
|
||||
Iterator<SearchHit> i1 = ((Iterable) o1).iterator();
|
||||
Iterator<SearchHit> i2 = ((Iterable) o2).iterator();
|
||||
while (i1.hasNext() && i2.hasNext()) {
|
||||
Assert.assertEquals(i1.next(), i2.next());
|
||||
SearchHit s1 = i1.next();
|
||||
SearchHit s2 = i2.next();
|
||||
Assert.assertEquals(s1, s2);
|
||||
Assert.assertEquals(s1.getCount(), s2.getCount());
|
||||
}
|
||||
Assert.assertTrue(!i1.hasNext() && !i2.hasNext());
|
||||
}
|
||||
|
|
@ -336,4 +339,38 @@ public class SearchBinaryFnTest
|
|||
Assert.assertEquals(expected.getTimestamp(), actual.getTimestamp());
|
||||
assertSearchMergeResult(expected.getValue(), actual.getValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMergeCountWithNull() {
|
||||
Result<SearchResultValue> r1 = new Result<SearchResultValue>(
|
||||
currTime,
|
||||
new SearchResultValue(
|
||||
ImmutableList.<SearchHit>of(
|
||||
new SearchHit(
|
||||
"blah",
|
||||
"foo"
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
Result<SearchResultValue> r2 = new Result<SearchResultValue>(
|
||||
currTime,
|
||||
new SearchResultValue(
|
||||
ImmutableList.<SearchHit>of(
|
||||
new SearchHit(
|
||||
"blah",
|
||||
"foo",
|
||||
3
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
Result<SearchResultValue> expected = r1;
|
||||
|
||||
Result<SearchResultValue> actual = new SearchBinaryFn(new LexicographicSearchSortSpec(), QueryGranularities.ALL, Integer.MAX_VALUE).apply(r1, r2);
|
||||
Assert.assertEquals(expected.getTimestamp(), actual.getTimestamp());
|
||||
assertSearchMergeResult(expected.getValue(), actual.getValue());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1107,27 +1107,27 @@ public class CachingClusteredClientTest
|
|||
client,
|
||||
builder.build(),
|
||||
new Interval("2011-01-01/2011-01-02"),
|
||||
makeSearchResults(new DateTime("2011-01-01"), "how", "howdy", "howwwwww", "howwy"),
|
||||
makeSearchResults(new DateTime("2011-01-01"), "how", 1, "howdy", 2, "howwwwww", 3, "howwy", 4),
|
||||
|
||||
new Interval("2011-01-02/2011-01-03"),
|
||||
makeSearchResults(new DateTime("2011-01-02"), "how1", "howdy1", "howwwwww1", "howwy1"),
|
||||
makeSearchResults(new DateTime("2011-01-02"), "how1", 1, "howdy1", 2, "howwwwww1", 3, "howwy1", 4),
|
||||
|
||||
new Interval("2011-01-05/2011-01-10"),
|
||||
makeSearchResults(
|
||||
new DateTime("2011-01-05"), "how2", "howdy2", "howwwwww2", "howww2",
|
||||
new DateTime("2011-01-06"), "how3", "howdy3", "howwwwww3", "howww3",
|
||||
new DateTime("2011-01-07"), "how4", "howdy4", "howwwwww4", "howww4",
|
||||
new DateTime("2011-01-08"), "how5", "howdy5", "howwwwww5", "howww5",
|
||||
new DateTime("2011-01-09"), "how6", "howdy6", "howwwwww6", "howww6"
|
||||
new DateTime("2011-01-05"), "how2", 1, "howdy2", 2, "howwwwww2", 3, "howww2", 4,
|
||||
new DateTime("2011-01-06"), "how3", 1, "howdy3", 2, "howwwwww3", 3, "howww3", 4,
|
||||
new DateTime("2011-01-07"), "how4", 1, "howdy4", 2, "howwwwww4", 3, "howww4", 4,
|
||||
new DateTime("2011-01-08"), "how5", 1, "howdy5", 2, "howwwwww5", 3, "howww5", 4,
|
||||
new DateTime("2011-01-09"), "how6", 1, "howdy6", 2, "howwwwww6", 3, "howww6", 4
|
||||
),
|
||||
|
||||
new Interval("2011-01-05/2011-01-10"),
|
||||
makeSearchResults(
|
||||
new DateTime("2011-01-05T01"), "how2", "howdy2", "howwwwww2", "howww2",
|
||||
new DateTime("2011-01-06T01"), "how3", "howdy3", "howwwwww3", "howww3",
|
||||
new DateTime("2011-01-07T01"), "how4", "howdy4", "howwwwww4", "howww4",
|
||||
new DateTime("2011-01-08T01"), "how5", "howdy5", "howwwwww5", "howww5",
|
||||
new DateTime("2011-01-09T01"), "how6", "howdy6", "howwwwww6", "howww6"
|
||||
new DateTime("2011-01-05T01"), "how2", 1, "howdy2", 2, "howwwwww2", 3, "howww2", 4,
|
||||
new DateTime("2011-01-06T01"), "how3", 1, "howdy3", 2, "howwwwww3", 3, "howww3", 4,
|
||||
new DateTime("2011-01-07T01"), "how4", 1, "howdy4", 2, "howwwwww4", 3, "howww4", 4,
|
||||
new DateTime("2011-01-08T01"), "how5", 1, "howdy5", 2, "howwwwww5", 3, "howww5", 4,
|
||||
new DateTime("2011-01-09T01"), "how6", 1, "howdy6", 2, "howwwwww6", 3, "howww6", 4
|
||||
)
|
||||
);
|
||||
|
||||
|
|
@ -1140,18 +1140,18 @@ public class CachingClusteredClientTest
|
|||
HashMap<String, Object> context = new HashMap<String, Object>();
|
||||
TestHelper.assertExpectedResults(
|
||||
makeSearchResults(
|
||||
new DateTime("2011-01-01"), "how", "howdy", "howwwwww", "howwy",
|
||||
new DateTime("2011-01-02"), "how1", "howdy1", "howwwwww1", "howwy1",
|
||||
new DateTime("2011-01-05"), "how2", "howdy2", "howwwwww2", "howww2",
|
||||
new DateTime("2011-01-05T01"), "how2", "howdy2", "howwwwww2", "howww2",
|
||||
new DateTime("2011-01-06"), "how3", "howdy3", "howwwwww3", "howww3",
|
||||
new DateTime("2011-01-06T01"), "how3", "howdy3", "howwwwww3", "howww3",
|
||||
new DateTime("2011-01-07"), "how4", "howdy4", "howwwwww4", "howww4",
|
||||
new DateTime("2011-01-07T01"), "how4", "howdy4", "howwwwww4", "howww4",
|
||||
new DateTime("2011-01-08"), "how5", "howdy5", "howwwwww5", "howww5",
|
||||
new DateTime("2011-01-08T01"), "how5", "howdy5", "howwwwww5", "howww5",
|
||||
new DateTime("2011-01-09"), "how6", "howdy6", "howwwwww6", "howww6",
|
||||
new DateTime("2011-01-09T01"), "how6", "howdy6", "howwwwww6", "howww6"
|
||||
new DateTime("2011-01-01"), "how", 1, "howdy", 2, "howwwwww", 3, "howwy", 4,
|
||||
new DateTime("2011-01-02"), "how1", 1, "howdy1", 2, "howwwwww1", 3, "howwy1", 4,
|
||||
new DateTime("2011-01-05"), "how2", 1, "howdy2", 2, "howwwwww2", 3, "howww2", 4,
|
||||
new DateTime("2011-01-05T01"), "how2", 1, "howdy2", 2, "howwwwww2", 3, "howww2", 4,
|
||||
new DateTime("2011-01-06"), "how3", 1, "howdy3", 2, "howwwwww3", 3, "howww3", 4,
|
||||
new DateTime("2011-01-06T01"), "how3", 1, "howdy3", 2, "howwwwww3", 3, "howww3", 4,
|
||||
new DateTime("2011-01-07"), "how4", 1, "howdy4", 2, "howwwwww4", 3, "howww4", 4,
|
||||
new DateTime("2011-01-07T01"), "how4", 1, "howdy4", 2, "howwwwww4", 3, "howww4", 4,
|
||||
new DateTime("2011-01-08"), "how5", 1, "howdy5", 2, "howwwwww5", 3, "howww5", 4,
|
||||
new DateTime("2011-01-08T01"), "how5", 1, "howdy5", 2, "howwwwww5", 3, "howww5", 4,
|
||||
new DateTime("2011-01-09"), "how6", 1, "howdy6", 2, "howwwwww6", 3, "howww6", 4,
|
||||
new DateTime("2011-01-09T01"), "how6", 1, "howdy6", 2, "howwwwww6", 3, "howww6", 4
|
||||
),
|
||||
runner.run(
|
||||
builder.intervals("2011-01-01/2011-01-10")
|
||||
|
|
@ -2118,7 +2118,7 @@ public class CachingClusteredClientTest
|
|||
|
||||
List<SearchHit> values = Lists.newArrayList();
|
||||
while (index < objects.length && !(objects[index] instanceof DateTime)) {
|
||||
values.add(new SearchHit(TOP_DIM, objects[index++].toString()));
|
||||
values.add(new SearchHit(TOP_DIM, objects[index++].toString(), (Integer) objects[index++]));
|
||||
}
|
||||
|
||||
retVal.add(new Result<>(timestamp, new SearchResultValue(values)));
|
||||
|
|
|
|||
Loading…
Reference in New Issue