Skip to content

Lazy-ify IncrementalIndex filtering too. #5852

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
jon-wei merged 2 commits into from
Jun 7, 2018
Merged

Lazy-ify IncrementalIndex filtering too. #5852

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
a8173fe
Lazy-ify IncrementalIndex filtering too.
gianm Jun 6, 2018
4519a3b
Fix logic error.
gianm Jun 6, 2018
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
2 changes: 1 addition & 1 deletion processing/src/main/java/io/druid/segment/DimensionSelectorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static ValueMatcher makeValueMatcherGeneric(DimensionSelector selector, S
if (idLookup != null) {
return makeDictionaryEncodedValueMatcherGeneric(selector, idLookup.lookupId(value), value == null);
} else if (selector.getValueCardinality() >= 0 && selector.nameLookupPossibleInAdvance()) {
// Employ precomputed BitSet optimization
// Employ caching BitSet optimization
return makeDictionaryEncodedValueMatcherGeneric(selector, Predicates.equalTo(value));
} else {
return makeNonDictionaryEncodedValueMatcherGeneric(selector, value);
Expand Down
22 changes: 17 additions & 5 deletions processing/src/main/java/io/druid/segment/StringDimensionIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public SortedDimensionDictionary(List<String> idToValue, int length)
this.idToIndex = new int[length];
this.indexToId = new int[length];
int index = 0;
for (IntIterator iterator = sortedMap.values().iterator(); iterator.hasNext();) {
for (IntIterator iterator = sortedMap.values().iterator(); iterator.hasNext(); ) {
int id = iterator.nextInt();
idToIndex[id] = index;
indexToId[index] = id;
Expand Down Expand Up @@ -496,16 +496,19 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
return BooleanValueMatcher.of(false);
}
} else {
// Employ precomputed BitSet optimization
// Employ caching BitSet optimization
return makeValueMatcher(Predicates.equalTo(value));
}
}

@Override
public ValueMatcher makeValueMatcher(final Predicate<String> predicate)
{
final BitSet predicateMatchingValueIds = DimensionSelectorUtils.makePredicateMatchingSet(this, predicate);
Copy link
Copy Markdown
Member

@leventov leventov Jun 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is DimensionSelectorUtils.makePredicateMatchingSet() still used or could be deleted?

Copy link
Copy Markdown
Contributor Author

@gianm gianm Jun 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still used in one place: ForwardingFilteredDimensionSpec. I would like to rewrite that code to be lazy in a follow up PR, and delete DimensionSelectorUtils.makePredicateMatchingSet at that time. I didn't do it in this patch since I wanted to keep it small.

final BitSet checkedIds = new BitSet(maxId);
final BitSet matchingIds = new BitSet(maxId);
final boolean matchNull = predicate.apply(null);

// Lazy matcher; only check an id if matches() is called.
return new ValueMatcher()
{
@Override
Expand All @@ -522,8 +525,17 @@ public boolean matches()
}

for (int id : dimsInt) {
if (predicateMatchingValueIds.get(id)) {
return true;
if (checkedIds.get(id)) {
if (matchingIds.get(id)) {
return true;
}
} else {
final boolean matches = predicate.apply(lookupName(id));
checkedIds.set(id);
if (matches) {
matchingIds.set(id);
return true;
}
}
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion processing/src/main/java/io/druid/segment/column/SimpleDictionaryEncodedColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
return BooleanValueMatcher.of(false);
}
} else {
// Employ precomputed BitSet optimization
// Employ caching BitSet optimization
return makeValueMatcher(Predicates.equalTo(value));
}
}
Expand Down