You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2024/08/19 11:02:26 UTC
(iotdb) 01/01: remove some wrong implementation code
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/fix_code
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4d4070802c35e08600be2fe80e2b6b4580b6f9ca
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Mon Aug 19 19:01:39 2024 +0800
remove some wrong implementation code
---
.../plan/relational/planner/PredicateUtils.java | 52 ----------------------
1 file changed, 52 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java
index 1c07128d62c..b90d59f0e6a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java
@@ -29,11 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral;
import org.apache.tsfile.utils.Pair;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME;
import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL;
@@ -305,54 +301,6 @@ public class PredicateUtils {
// allMeasurements, isBuildPlanUseTemplate, typeProvider));
// }
- /**
- * Combine the given conjuncts into a single expression using "and".
- *
- * @param conjuncts given conjuncts
- * @return the expression combined by the given conjuncts
- */
- public static Expression combineConjuncts(List<Expression> conjuncts) {
- if (conjuncts.size() == 1) {
- return conjuncts.get(0);
- }
- return constructRightDeepTreeWithAnd(conjuncts);
- }
-
- private static Expression constructRightDeepTreeWithAnd(List<Expression> conjuncts) {
- // TODO: consider other structures of tree
- if (conjuncts.size() == 2) {
- return and(conjuncts.get(0), conjuncts.get(1));
- } else {
- return and(
- conjuncts.get(0), constructRightDeepTreeWithAnd(conjuncts.subList(1, conjuncts.size())));
- }
- }
-
- public static Expression removeDuplicateConjunct(Expression predicate) {
- if (predicate == null) {
- return null;
- }
- Set<Expression> conjuncts = new HashSet<>();
- extractConjuncts(predicate, conjuncts);
- return combineConjuncts(new ArrayList<>(conjuncts));
- }
-
- public static List<Expression> extractConjuncts(Expression predicate) {
- Set<Expression> conjuncts = new HashSet<>();
- extractConjuncts(predicate, conjuncts);
- return new ArrayList<>(conjuncts);
- }
-
- private static void extractConjuncts(Expression predicate, Set<Expression> conjuncts) {
- if (predicate instanceof LogicalExpression
- && ((LogicalExpression) predicate).getOperator() == AND) {
- extractConjuncts(((LogicalExpression) predicate).getTerms().get(0), conjuncts);
- extractConjuncts(((LogicalExpression) predicate).getTerms().get(1), conjuncts);
- } else {
- conjuncts.add(predicate);
- }
- }
-
/**
* Extract the source symbol (full path for non-aligned path, device path for aligned path) from
* the given predicate. If the predicate contains multiple source symbols, return null.