Jackie-Jiang commented on a change in pull request #8451: URL: https://github.com/apache/pinot/pull/8451#discussion_r840834410
########## File path: pinot-common/src/main/java/org/apache/pinot/common/request/context/predicate/BasePredicate.java ########## @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.common.request.context.predicate; + +import org.apache.pinot.common.request.context.ExpressionContext; + + +/** + * Abstract predicate with left-hand side expression + */ +public abstract class BasePredicate implements Predicate { + + protected ExpressionContext _lhs; + + public BasePredicate(ExpressionContext lhs) { + _lhs = lhs; + } + + @Override + public ExpressionContext getLhs() { + return _lhs; + } + + public void setLhs(ExpressionContext lhs) { Review comment: add `@Override` ########## File path: pinot-common/src/main/java/org/apache/pinot/common/request/context/predicate/Predicate.java ########## @@ -54,4 +54,9 @@ public boolean isExclusive() { * Returns the left-hand side expression of the predicate. */ ExpressionContext getLhs(); + + /** + * Set the left-hand side expression of the predicate. Review comment: (nit) ```suggestion * Sets the left-hand side expression of the predicate. ``` ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -228,6 +231,9 @@ private void applyQueryOptions(QueryContext queryContext) { @Override public PlanNode makeSegmentPlanNode(IndexSegment indexSegment, QueryContext queryContext) { + if (queryContext.getExpressionOverrideHints() != null && !queryContext.getExpressionOverrideHints().isEmpty()) { Review comment: (minor) ```suggestion if (MapUtils.isNotEmpty(queryContext.getExpressionOverrideHints())) { ``` ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { Review comment: This check is redundant ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); + if (groupByExpression != null && !groupByExpression.isEmpty()) { Review comment: (minor) Same for other places ```suggestion if (CollectionUtils.isNotEmpty(groupByExpression)) { ``` ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); + if (groupByExpression != null && !groupByExpression.isEmpty()) { + for (int i = 0; i < groupByExpression.size(); i++) { Review comment: This can be simplified with `replaceAll()`, which can be faster for certain `List` impl. Same for other places ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/BrokerRequestToQueryContextConverter.java ########## @@ -149,12 +151,23 @@ private static QueryContext convertSQL(PinotQuery pinotQuery, BrokerRequest brok havingFilter = RequestContextUtils.getFilter(havingExpression); } + // EXPRESSION OVERRIDE HINTS + Map<ExpressionContext, ExpressionContext> expressionContextOverrideHints = new HashMap<>(); + Map<Expression, Expression> expressionOverrideHints = pinotQuery.getExpressionOverrideHints(); + if (expressionOverrideHints != null) { + for (Expression key : expressionOverrideHints.keySet()) { Review comment: Use `.entrySet()` to avoid extra lookups ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); + if (groupByExpression != null && !groupByExpression.isEmpty()) { + for (int i = 0; i < groupByExpression.size(); i++) { + groupByExpression.set(i, overrideWithExpressionHints(groupByExpression.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<OrderByExpressionContext> orderByExpression = queryContext.getOrderByExpressions(); + if (orderByExpression != null && !orderByExpression.isEmpty()) { + for (int i = 0; i < orderByExpression.size(); i++) { + OrderByExpressionContext expression = orderByExpression.get(i); + orderByExpression.set(i, new OrderByExpressionContext( + overrideWithExpressionHints(expression.getExpression(), indexSegment, + queryContext.getExpressionOverrideHints()), expression.isAsc())); + } + } + + // In-place override + FilterContext filter = queryContext.getFilter(); + if (filter != null) { + overrideWithExpressionHints(filter, indexSegment, queryContext.getExpressionOverrideHints()); + } + + // In-place override + FilterContext havingFilter = queryContext.getHavingFilter(); + if (havingFilter != null) { + overrideWithExpressionHints(havingFilter, indexSegment, queryContext.getExpressionOverrideHints()); + } + } + + @VisibleForTesting + public static void overrideWithExpressionHints(FilterContext filter, IndexSegment indexSegment, + Map<ExpressionContext, ExpressionContext> expressionOverrideHints) { + if (filter.getChildren() != null) { + // AND, OR, NOT + for (FilterContext child : filter.getChildren()) { + overrideWithExpressionHints(child, indexSegment, expressionOverrideHints); + } + return; + } + // PREDICATE + Predicate predicate = filter.getPredicate(); + predicate.setLhs(overrideWithExpressionHints(predicate.getLhs(), indexSegment, expressionOverrideHints)); + } + + @VisibleForTesting + public static ExpressionContext overrideWithExpressionHints(ExpressionContext expression, IndexSegment indexSegment, + Map<ExpressionContext, ExpressionContext> expressionOverrideHints) { + if (expression.getType() != ExpressionContext.Type.FUNCTION) { + return expression; + } + ExpressionContext overrideExpression = expressionOverrideHints.get(expression); + if (overrideExpression != null && overrideExpression.getIdentifier() != null + && indexSegment.getPhysicalColumnNames().contains(overrideExpression.getIdentifier())) { Review comment: (MAJOR) `indexSegment.getPhysicalColumnNames()` is quite expensive, and conceptually we should also allow overriding to virtual columns. Use `indexSegment.getColumnNames()` instead ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); + if (groupByExpression != null && !groupByExpression.isEmpty()) { + for (int i = 0; i < groupByExpression.size(); i++) { + groupByExpression.set(i, overrideWithExpressionHints(groupByExpression.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<OrderByExpressionContext> orderByExpression = queryContext.getOrderByExpressions(); + if (orderByExpression != null && !orderByExpression.isEmpty()) { + for (int i = 0; i < orderByExpression.size(); i++) { + OrderByExpressionContext expression = orderByExpression.get(i); + orderByExpression.set(i, new OrderByExpressionContext( + overrideWithExpressionHints(expression.getExpression(), indexSegment, + queryContext.getExpressionOverrideHints()), expression.isAsc())); + } + } + + // In-place override + FilterContext filter = queryContext.getFilter(); + if (filter != null) { + overrideWithExpressionHints(filter, indexSegment, queryContext.getExpressionOverrideHints()); + } + + // In-place override + FilterContext havingFilter = queryContext.getHavingFilter(); + if (havingFilter != null) { + overrideWithExpressionHints(havingFilter, indexSegment, queryContext.getExpressionOverrideHints()); + } + } + + @VisibleForTesting + public static void overrideWithExpressionHints(FilterContext filter, IndexSegment indexSegment, + Map<ExpressionContext, ExpressionContext> expressionOverrideHints) { + if (filter.getChildren() != null) { + // AND, OR, NOT + for (FilterContext child : filter.getChildren()) { + overrideWithExpressionHints(child, indexSegment, expressionOverrideHints); + } + return; Review comment: (minor) Suggest using `else` instead of `return` for better readability ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); Review comment: ```suggestion List<ExpressionContext> groupByExpressions = queryContext.getGroupByExpressions(); ``` ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -228,6 +231,9 @@ private void applyQueryOptions(QueryContext queryContext) { @Override public PlanNode makeSegmentPlanNode(IndexSegment indexSegment, QueryContext queryContext) { + if (queryContext.getExpressionOverrideHints() != null && !queryContext.getExpressionOverrideHints().isEmpty()) { Review comment: Move this check into `rewriteQueryContextWithHints` because conceptually it should handle other hints rewrite as well ########## File path: pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java ########## @@ -281,4 +287,84 @@ public PlanNode makeStreamingSegmentPlanNode(IndexSegment indexSegment, QueryCon return new StreamingSelectionPlanNode(indexSegment, queryContext); } } + + /** + * In-place rewrite QueryContext based on the information from local IndexSegment. + * + * @param queryContext + * @param indexSegment + */ + @VisibleForTesting + public static void rewriteQueryContextWithHints(QueryContext queryContext, IndexSegment indexSegment) { + List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); + if (selectExpressions != null && !selectExpressions.isEmpty()) { + for (int i = 0; i < selectExpressions.size(); i++) { + selectExpressions.set(i, overrideWithExpressionHints(selectExpressions.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<ExpressionContext> groupByExpression = queryContext.getGroupByExpressions(); + if (groupByExpression != null && !groupByExpression.isEmpty()) { + for (int i = 0; i < groupByExpression.size(); i++) { + groupByExpression.set(i, overrideWithExpressionHints(groupByExpression.get(i), indexSegment, + queryContext.getExpressionOverrideHints())); + } + } + + List<OrderByExpressionContext> orderByExpression = queryContext.getOrderByExpressions(); Review comment: ```suggestion List<OrderByExpressionContext> orderByExpressions = queryContext.getOrderByExpressions(); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
