Skip to content

Make minValues and maxValues the same length as minMaxChannels #13845

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
sopel39 merged 1 commit into from
Aug 25, 2022
Merged

Make minValues and maxValues the same length as minMaxChannels #13845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions core/trino-main/src/main/java/io/trino/operator/DynamicFilterSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ private DynamicFilterSourceOperator(
this.minMaxCollectionLimit = minMaxCollectionLimit;
this.minMaxChannels = minMaxChannelsBuilder.build();
if (!minMaxChannels.isEmpty()) {
this.minValues = new Block[channels.size()];
this.maxValues = new Block[channels.size()];
this.minValues = new Block[minMaxChannels.size()];
this.maxValues = new Block[minMaxChannels.size()];
}
this.minMaxComparisons = minMaxComparisonsBuilder.build();
}
Expand Down Expand Up @@ -249,7 +249,7 @@ public void addInput(Page page)
Integer channelIndex = minMaxChannels.get(i);
BlockPositionComparison comparison = minMaxComparisons.get(i);
Block block = page.getBlock(channels.get(channelIndex).index);
updateMinMaxValues(block, channelIndex, comparison);
updateMinMaxValues(block, i, comparison);
}
return;
}
Expand Down Expand Up @@ -290,7 +290,7 @@ private void handleTooLargePredicate()
Integer channelIndex = minMaxChannels.get(i);
BlockPositionComparison comparison = minMaxComparisons.get(i);
Block block = blockBuilders[channelIndex].build();
updateMinMaxValues(block, channelIndex, comparison);
updateMinMaxValues(block, i, comparison);
}
}
}
Expand Down Expand Up @@ -379,15 +379,16 @@ public void finish()
return;
}
// valueSets became too large, create TupleDomain from min/max values
for (Integer channelIndex : minMaxChannels) {
for (int i = 0; i < minMaxChannels.size(); i++) {
Integer channelIndex = minMaxChannels.get(i);
Type type = channels.get(channelIndex).type;
if (minValues[channelIndex] == null) {
if (minValues[i] == null) {
// all values were null
domainsBuilder.put(channels.get(channelIndex).filterId, Domain.none(type));
continue;
}
Object min = blockToNativeValue(type, minValues[channelIndex]);
Object max = blockToNativeValue(type, maxValues[channelIndex]);
Object min = blockToNativeValue(type, minValues[i]);
Object max = blockToNativeValue(type, maxValues[i]);
Domain domain = Domain.create(
ValueSet.ofRanges(range(type, min, true, max, true)),
false);
Expand Down