Skip to content

[pull] master from prestodb:master #549

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
pull merged 4 commits into from
Feb 4, 2026
Merged

[pull] master from prestodb:master #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5525534
fix: Resolve table names in MV query optimizer for consistent matchin…
ceekay47 Feb 4, 2026
9ab52f5
test(native): Add ipprefix and ipaddress tests to native-tests (#26905)
wongquijote Feb 4, 2026
93def8b
fix(planner): Fix filter stats estimation corner cases (#26812)
aaneja Feb 4, 2026
e100648
feat(native): Add config for asyc cache numShards (#27073)
kewang1024 Feb 4, 2026
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
1 change: 0 additions & 1 deletion presto-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
5 changes: 1 addition & 4 deletions ...m/facebook/presto/type/IpAddressType.java → ...ook/presto/common/type/IpAddressType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.type;
package com.facebook.presto.common.type;

import com.facebook.presto.common.block.Block;
import com.facebook.presto.common.block.BlockBuilder;
import com.facebook.presto.common.block.BlockBuilderStatus;
import com.facebook.presto.common.block.Int128ArrayBlockBuilder;
import com.facebook.presto.common.block.PageBuilderStatus;
import com.facebook.presto.common.function.SqlFunctionProperties;
import com.facebook.presto.common.type.AbstractPrimitiveType;
import com.facebook.presto.common.type.FixedWidthType;
import com.facebook.presto.common.type.StandardTypes;
import com.google.common.net.InetAddresses;
import io.airlift.slice.Slice;
import io.airlift.slice.Slices;
Expand Down
5 changes: 1 addition & 4 deletions ...om/facebook/presto/type/IpPrefixType.java → ...book/presto/common/type/IpPrefixType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.type;
package com.facebook.presto.common.type;

import com.facebook.presto.common.block.Block;
import com.facebook.presto.common.block.BlockBuilder;
import com.facebook.presto.common.block.BlockBuilderStatus;
import com.facebook.presto.common.block.PageBuilderStatus;
import com.facebook.presto.common.block.VariableWidthBlockBuilder;
import com.facebook.presto.common.function.SqlFunctionProperties;
import com.facebook.presto.common.type.AbstractPrimitiveType;
import com.facebook.presto.common.type.FixedWidthType;
import com.facebook.presto.common.type.StandardTypes;
import com.google.common.net.InetAddresses;
import io.airlift.slice.Slice;
import io.airlift.slice.XxHash64;
Expand Down
16 changes: 14 additions & 2 deletions presto-main-base/src/main/java/com/facebook/presto/cost/ComparisonStatsCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,26 @@ private PlanNodeStatsEstimate estimateExpressionNotEqualToLiteral(
else {
filterRange = new StatisticRange(NEGATIVE_INFINITY, true, POSITIVE_INFINITY, true, 1);
}
double filterFactor = 1 - calculateFilterFactor(expressionStatistics, filterRange);

double filterFactor;
double expressionNDV = expressionStatistics.getDistinctValuesCount();
if (Double.compare(expressionNDV, 1D) == 0) {
// It's hard to make a meaningful estimate when we have only one distinct value
filterFactor = UNKNOWN_FILTER_COEFFICIENT;
}
else {
filterFactor = 1 - calculateFilterFactor(expressionStatistics, filterRange);
}

PlanNodeStatsEstimate.Builder estimate = PlanNodeStatsEstimate.buildFrom(inputStatistics);
estimate.setOutputRowCount(filterFactor * (1 - expressionStatistics.getNullsFraction()) * inputStatistics.getOutputRowCount());
if (expressionVariable.isPresent()) {
// If the original NDV was 1, we do not make any changes to the new estimate, since we're not sure if we eliminated the only distinct value
// Otherwise, we reduce the NDV by 1 (unless it was already 0)
double newNDV = Double.compare(expressionNDV, 1D) == 0 ? 1 : max(expressionNDV - 1, 0);
VariableStatsEstimate symbolNewEstimate = buildFrom(expressionStatistics)
.setNullsFraction(0.0)
.setDistinctValuesCount(max(expressionStatistics.getDistinctValuesCount() - 1, 0))
.setDistinctValuesCount(newNDV)
.build();
estimate = estimate.addVariableStatistics(expressionVariable.get(), symbolNewEstimate);
}
Expand Down
16 changes: 14 additions & 2 deletions presto-main-base/src/main/java/com/facebook/presto/cost/FilterStatsCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,21 @@
import static java.lang.Double.NaN;
import static java.lang.Double.isInfinite;
import static java.lang.Double.isNaN;
import static java.lang.Double.max;
import static java.lang.Double.min;
import static java.lang.String.format;
import static java.util.Collections.emptyMap;
import static java.util.Objects.requireNonNull;

public class FilterStatsCalculator
{
/**
*
* This value applies a filter factor to upper-bound the size of the variable range selected for an IN predicate
* Since the estimator sums up the individual estimates, we don't want to go beyond 1.0
* This also impacts NOT IN similarly, we never apply a filter factor of 0.0 for a NOT IN clause
*/
static final double CEIL_IN_PREDICATE_UPPER_BOUND_COEFFICIENT = 0.8;
static final double UNKNOWN_FILTER_COEFFICIENT = 0.9;

private final Metadata metadata;
Expand Down Expand Up @@ -403,9 +411,11 @@ protected PlanNodeStatsEstimate visitInPredicate(InPredicate node, Void context)
}

double notNullValuesBeforeIn = input.getOutputRowCount() * (1 - valueStats.getNullsFraction());
double ceiledInEstimated = max(notNullValuesBeforeIn * CEIL_IN_PREDICATE_UPPER_BOUND_COEFFICIENT, 1.0);
double inEstimateRowCount = min(inEstimate.getOutputRowCount(), ceiledInEstimated);

PlanNodeStatsEstimate.Builder result = PlanNodeStatsEstimate.buildFrom(input);
result.setOutputRowCount(min(inEstimate.getOutputRowCount(), notNullValuesBeforeIn));
result.setOutputRowCount(inEstimateRowCount);

if (node.getValue() instanceof SymbolReference) {
VariableReferenceExpression valueVariable = toVariable(node.getValue());
Expand Down Expand Up @@ -774,9 +784,11 @@ private PlanNodeStatsEstimate estimateIn(RowExpression value, List<RowExpression
}

double notNullValuesBeforeIn = input.getOutputRowCount() * (1 - valueStats.getNullsFraction());
double ceiledInEstimated = max(notNullValuesBeforeIn * CEIL_IN_PREDICATE_UPPER_BOUND_COEFFICIENT, 1.0);
double inEstimateRowCount = min(inEstimate.getOutputRowCount(), ceiledInEstimated);

PlanNodeStatsEstimate.Builder result = PlanNodeStatsEstimate.buildFrom(input);
result.setOutputRowCount(min(inEstimate.getOutputRowCount(), notNullValuesBeforeIn));
result.setOutputRowCount(inEstimateRowCount);

if (value instanceof VariableReferenceExpression) {
VariableReferenceExpression valueVariable = (VariableReferenceExpression) value;
Expand Down
4 changes: 2 additions & 2 deletions ...se/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@
import static com.facebook.presto.common.type.DoubleType.OLD_NAN_DOUBLE;
import static com.facebook.presto.common.type.HyperLogLogType.HYPER_LOG_LOG;
import static com.facebook.presto.common.type.IntegerType.INTEGER;
import static com.facebook.presto.common.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.common.type.IpPrefixType.IPPREFIX;
import static com.facebook.presto.common.type.JsonType.JSON;
import static com.facebook.presto.common.type.KdbTreeType.KDB_TREE;
import static com.facebook.presto.common.type.KllSketchParametricType.KLL_SKETCH;
Expand Down Expand Up @@ -504,8 +506,6 @@
import static com.facebook.presto.type.FunctionParametricType.FUNCTION;
import static com.facebook.presto.type.IntervalDayTimeType.INTERVAL_DAY_TIME;
import static com.facebook.presto.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
import static com.facebook.presto.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.type.IpPrefixType.IPPREFIX;
import static com.facebook.presto.type.JoniRegexpType.JONI_REGEXP;
import static com.facebook.presto.type.JsonPathType.JSON_PATH;
import static com.facebook.presto.type.LikePatternType.LIKE_PATTERN;
Expand Down
4 changes: 2 additions & 2 deletions presto-main-base/src/main/java/com/facebook/presto/operator/scalar/IpPrefixFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
import java.util.Comparator;
import java.util.List;

import static com.facebook.presto.common.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.common.type.IpPrefixType.IPPREFIX;
import static com.facebook.presto.operator.scalar.ArraySortFunction.sort;
import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static com.facebook.presto.type.IpAddressOperators.between;
import static com.facebook.presto.type.IpAddressOperators.castFromVarcharToIpAddress;
import static com.facebook.presto.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.type.IpPrefixOperators.castFromIpPrefixToIpAddress;
import static com.facebook.presto.type.IpPrefixOperators.castFromVarcharToIpPrefix;
import static com.facebook.presto.type.IpPrefixType.IPPREFIX;
import static com.facebook.presto.util.Failures.checkCondition;
import static io.airlift.slice.Slices.utf8Slice;
import static io.airlift.slice.Slices.wrappedBuffer;
Expand Down
13 changes: 13 additions & 0 deletions presto-main-base/src/main/java/com/facebook/presto/sql/MaterializedViewUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.facebook.presto.sql;

import com.facebook.presto.Session;
import com.facebook.presto.common.QualifiedObjectName;
import com.facebook.presto.common.predicate.NullableValue;
import com.facebook.presto.common.predicate.TupleDomain;
import com.facebook.presto.metadata.Metadata;
Expand All @@ -40,7 +41,9 @@
import com.facebook.presto.sql.tree.IsNullPredicate;
import com.facebook.presto.sql.tree.LogicalBinaryExpression;
import com.facebook.presto.sql.tree.QualifiedName;
import com.facebook.presto.sql.tree.Relation;
import com.facebook.presto.sql.tree.SymbolReference;
import com.facebook.presto.sql.tree.Table;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
Expand All @@ -60,6 +63,7 @@
import static com.facebook.presto.common.predicate.TupleDomain.extractFixedValues;
import static com.facebook.presto.common.type.StandardTypes.HYPER_LOG_LOG;
import static com.facebook.presto.common.type.StandardTypes.VARBINARY;
import static com.facebook.presto.metadata.MetadataUtil.createQualifiedObjectName;
import static com.facebook.presto.sql.ExpressionUtils.combineDisjuncts;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.NOT_SUPPORTED;
import static com.facebook.presto.sql.tree.ArithmeticBinaryExpression.Operator.DIVIDE;
Expand Down Expand Up @@ -399,6 +403,15 @@ public static Expression convertMaterializedDataPredicatesToExpression(
}
}

public static Relation resolveTableName(Relation relation, Session session, Metadata metadata)
{
if (!(relation instanceof Table)) {
return relation;
}
QualifiedObjectName qualifiedTableName = createQualifiedObjectName(session, relation, ((Table) relation).getName(), metadata);
return new Table(QualifiedName.of(qualifiedTableName.getSchemaName(), qualifiedTableName.getObjectName()));
}

private static Expression convertSymbolReferencesToIdentifiers(Expression expression)
{
return ExpressionTreeRewriter.rewriteWith(new ExpressionRewriter<Void>()
Expand Down
4 changes: 3 additions & 1 deletion ...n-base/src/main/java/com/facebook/presto/sql/analyzer/MaterializedViewQueryOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
import static com.facebook.presto.sql.MaterializedViewUtils.COUNT;
import static com.facebook.presto.sql.MaterializedViewUtils.NON_ASSOCIATIVE_REWRITE_FUNCTIONS;
import static com.facebook.presto.sql.MaterializedViewUtils.SUM;
import static com.facebook.presto.sql.MaterializedViewUtils.resolveTableName;
import static com.facebook.presto.sql.analyzer.MaterializedViewInformationExtractor.MaterializedViewInfo;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.MISSING_TABLE;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.NOT_SUPPORTED;
Expand Down Expand Up @@ -641,7 +642,8 @@ protected Node visitAliasedRelation(AliasedRelation node, Void context)
@Override
protected Node visitRelation(Relation node, Void context)
{
if (materializedViewInfo.getBaseTable().isPresent() && node.equals(materializedViewInfo.getBaseTable().get())) {
if (materializedViewInfo.getBaseTable().isPresent() && resolveTableName(node, session, metadata)
.equals(resolveTableName(materializedViewInfo.getBaseTable().get(), session, metadata))) {
return materializedView;
}
throw new IllegalStateException("Mismatching table or non-supporting relation format in base query");
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/facebook/presto/sql/planner/sanity/CheckUnsupportedPrestissimoTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
import java.util.Objects;
import java.util.Optional;

import static com.facebook.presto.common.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.common.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIME_ZONE;
import static com.facebook.presto.type.IpAddressType.IPADDRESS;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;

Expand Down
2 changes: 1 addition & 1 deletion presto-main-base/src/main/java/com/facebook/presto/type/IpAddressOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
import static com.facebook.presto.common.function.OperatorType.LESS_THAN_OR_EQUAL;
import static com.facebook.presto.common.function.OperatorType.NOT_EQUAL;
import static com.facebook.presto.common.function.OperatorType.XX_HASH_64;
import static com.facebook.presto.common.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
import static com.facebook.presto.type.IpAddressType.IPADDRESS;
import static io.airlift.slice.Slices.utf8Slice;
import static io.airlift.slice.Slices.wrappedBuffer;
import static java.lang.System.arraycopy;
Expand Down
4 changes: 2 additions & 2 deletions presto-main-base/src/main/java/com/facebook/presto/type/IpPrefixOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
import static com.facebook.presto.common.function.OperatorType.LESS_THAN_OR_EQUAL;
import static com.facebook.presto.common.function.OperatorType.NOT_EQUAL;
import static com.facebook.presto.common.function.OperatorType.XX_HASH_64;
import static com.facebook.presto.common.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.common.type.IpPrefixType.IPPREFIX;
import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
import static com.facebook.presto.type.IpAddressType.IPADDRESS;
import static com.facebook.presto.type.IpPrefixType.IPPREFIX;
import static io.airlift.slice.Slices.utf8Slice;
import static io.airlift.slice.Slices.wrappedBuffer;
import static java.lang.Math.max;
Expand Down
Loading
Loading