liuminghui233 commented on code in PR #9236: URL: https://github.com/apache/iotdb/pull/9236#discussion_r1129079260
########## server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/CartesianProductVisitor.java: ########## @@ -0,0 +1,53 @@ +/* + * 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.iotdb.db.mpp.plan.expression.visitor; + +import org.apache.iotdb.db.mpp.plan.expression.Expression; +import org.apache.iotdb.db.mpp.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.unary.UnaryExpression; + +import java.util.ArrayList; +import java.util.List; + +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.cartesianProductAllKindsOfExpression; + +public class CartesianProductVisitor<C> extends ExpressionAnalyzeVisitor<List<Expression>, C> { Review Comment: make `CartesianProductVisitor` abstract ########## server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/CollectVisitor.java: ########## @@ -0,0 +1,62 @@ +/* + * 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.iotdb.db.mpp.plan.expression.visitor; + +import org.apache.iotdb.db.mpp.plan.expression.Expression; +import org.apache.iotdb.db.mpp.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.mpp.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.unary.UnaryExpression; + +import java.util.ArrayList; +import java.util.List; + +/** + * Simply collects result from child-expression. For example, two child give me 3 and 4 results, I + * will return 3+4 = 7 results to upper level. + */ +public class CollectVisitor extends ExpressionAnalyzeVisitor<List<Expression>, Void> { + protected List<Expression> collectFromChild(Expression expression) { + List<Expression> result = new ArrayList<>(); + for (Expression child : expression.getExpressions()) result.addAll(process(child, null)); + return result; + } + + @Override + public List<Expression> visitTernaryExpression( + TernaryExpression ternaryExpression, Void context) { + return collectFromChild(ternaryExpression); + } + + @Override + public List<Expression> visitBinaryExpression(BinaryExpression binaryExpression, Void context) { + return collectFromChild(binaryExpression); + } + + @Override + public List<Expression> visitUnaryExpression(UnaryExpression unaryExpression, Void context) { + return collectFromChild(unaryExpression); + } + + @Override + public List<Expression> visitLeafOperand(LeafOperand leafOperand, Void context) { + return super.visitLeafOperand(leafOperand, context); + } Review Comment: redundant override ########## server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java: ########## @@ -318,6 +250,9 @@ public static List<Expression> concatExpressionWithSuffixPaths( */ public static List<PartialPath> concatExpressionWithSuffixPaths( Expression expression, List<PartialPath> prefixPaths) { + // return new ConcatExpressionWithSuffixPathsVisitor().process( + // expression, new ConcatExpressionWithSuffixPathsVisitor.Context(prefixPaths, + // null)); Review Comment: remove useless comment ########## server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/RemoveWildcardInFilterVisitor.java: ########## @@ -0,0 +1,148 @@ +/* + * 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.iotdb.db.mpp.plan.expression.visitor; + +import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.constant.SqlConstant; +import org.apache.iotdb.db.mpp.common.schematree.ISchemaTree; +import org.apache.iotdb.db.mpp.plan.expression.Expression; +import org.apache.iotdb.db.mpp.plan.expression.ExpressionType; +import org.apache.iotdb.db.mpp.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.mpp.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.mpp.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.mpp.plan.expression.multi.FunctionExpression; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.cartesianProduct; +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.reconstructBinaryExpressions; +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.reconstructFunctionExpressions; +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperands; +import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForAggregationNonSeriesInputExpressions; + +public class RemoveWildcardInFilterVisitor + extends CartesianProductVisitor<RemoveWildcardInFilterVisitor.Context> { + @Override + public List<Expression> visitBinaryExpression( + BinaryExpression binaryExpression, Context context) { + List<Expression> leftExpressions = + process(binaryExpression.getLeftExpression(), context.notRootClone()); + // removeWildcardInFilter( + // ((BinaryExpression) predicate).getLeftExpression(), prefixPaths, + // schemaTree, false); + List<Expression> rightExpressions = + process(binaryExpression.getRightExpression(), context.notRootClone()); + // removeWildcardInFilter( + // ((BinaryExpression) predicate).getRightExpression(), prefixPaths, + // schemaTree, false); + if (context.isRoot() && binaryExpression.getExpressionType() == ExpressionType.LOGIC_AND) { + List<Expression> resultExpressions = new ArrayList<>(leftExpressions); + resultExpressions.addAll(rightExpressions); + return resultExpressions; + } + return reconstructBinaryExpressions( + binaryExpression.getExpressionType(), leftExpressions, rightExpressions); + } + + @Override + public List<Expression> visitFunctionExpression(FunctionExpression predicate, Context context) { + List<List<Expression>> extendedExpressions = new ArrayList<>(); + for (Expression suffixExpression : predicate.getExpressions()) { + extendedExpressions.add( + process( + suffixExpression, + new Context(context.getPrefixPaths(), context.getSchemaTree(), false))); + + // We just process first input Expression of AggregationFunction, + // keep other input Expressions as origin and bind Type + // If AggregationFunction need more than one input series, + // we need to reconsider the process of it + if (predicate.isBuiltInAggregationFunctionExpression()) { + List<Expression> children = predicate.getExpressions(); + bindTypeForAggregationNonSeriesInputExpressions( + predicate.getFunctionName(), children, extendedExpressions); + break; + } + } + List<List<Expression>> childExpressionsList = new ArrayList<>(); + cartesianProduct(extendedExpressions, childExpressionsList, 0, new ArrayList<>()); + return reconstructFunctionExpressions(predicate, childExpressionsList); + } + + @Override + public List<Expression> visitTimeSeriesOperand(TimeSeriesOperand predicate, Context context) { + PartialPath filterPath = predicate.getPath(); + List<PartialPath> concatPaths = new ArrayList<>(); + if (!filterPath.getFirstNode().equals(SqlConstant.ROOT)) { + context.getPrefixPaths().forEach(prefix -> concatPaths.add(prefix.concatPath(filterPath))); + } else { + // do nothing in the case of "where root.d1.s1 > 5" + concatPaths.add(filterPath); + } + + List<PartialPath> noStarPaths = new ArrayList<>(); + for (PartialPath concatPath : concatPaths) { + List<MeasurementPath> actualPaths = + context.getSchemaTree().searchMeasurementPaths(concatPath).left; + if (actualPaths.isEmpty()) { + return Collections.singletonList(new NullOperand()); + } + noStarPaths.addAll(actualPaths); + } + return reconstructTimeSeriesOperands(noStarPaths); + } + + @Override + public List<Expression> visitLeafOperand(LeafOperand leafOperand, Context context) { Review Comment: It is confusing to have `visitTimeSeriesOperand()` and `visitLeafOperand()` at the same time. This is handled better in `RemoveWildcardInFilterByDeviceVisitor`, I think. ########## server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/ReconstructVisitor.java: ########## @@ -0,0 +1,64 @@ +/* + * 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.iotdb.db.mpp.plan.expression.visitor; + +import org.apache.iotdb.db.mpp.plan.expression.Expression; +import org.apache.iotdb.db.mpp.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.mpp.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.unary.UnaryExpression; + +import java.util.ArrayList; +import java.util.List; + +import static org.apache.iotdb.db.mpp.plan.analyze.ExpressionUtils.reconstructAllKindsOfExpression; + +/** + * Collect result from child, then reconstruct. For example, two child each give me 1 result, I + * should use them to reconstruct 1 new result to upper level. + */ +public class ReconstructVisitor<C> extends ExpressionAnalyzeVisitor<Expression, C> { Review Comment: make `ReconstructVisitor` abstract ########## server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/CollectVisitor.java: ########## @@ -0,0 +1,62 @@ +/* + * 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.iotdb.db.mpp.plan.expression.visitor; + +import org.apache.iotdb.db.mpp.plan.expression.Expression; +import org.apache.iotdb.db.mpp.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.mpp.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.mpp.plan.expression.unary.UnaryExpression; + +import java.util.ArrayList; +import java.util.List; + +/** + * Simply collects result from child-expression. For example, two child give me 3 and 4 results, I + * will return 3+4 = 7 results to upper level. + */ +public class CollectVisitor extends ExpressionAnalyzeVisitor<List<Expression>, Void> { Review Comment: make `CollectVisitor` abstract -- 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]
