You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by la...@apache.org on 2024/12/08 09:26:35 UTC
(iotdb) branch support_uncorrelated_in_predicate updated (9186e0035c0 -> 8d8fd9483a5)
This is an automated email from the ASF dual-hosted git repository.
lancelly pushed a change to branch support_uncorrelated_in_predicate
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 9186e0035c0 Fix mergesort join
new a07fc9a1e1b remove unnecessary instance of RowType/RowDataType judgement
new 8d8fd9483a5 Add check for only single column subquery supported
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../relational/ColumnTransformerBuilder.java | 15 --------
.../plan/planner/TableOperatorGenerator.java | 11 +-----
.../plan/relational/planner/SubqueryPlanner.java | 43 ++++++++++++----------
.../plan/relational/type/InternalTypeManager.java | 40 +-------------------
.../relational/type/TypeSignatureTranslator.java | 23 +-----------
5 files changed, 27 insertions(+), 105 deletions(-)
(iotdb) 02/02: Add check for only single column subquery supported
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lancelly pushed a commit to branch support_uncorrelated_in_predicate
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8d8fd9483a589d6b559ef3bd077f9ad72ac231d1
Author: lancelly <14...@qq.com>
AuthorDate: Sun Dec 8 17:26:20 2024 +0800
Add check for only single column subquery supported
---
.../plan/relational/planner/SubqueryPlanner.java | 43 ++++++++++++----------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java
index 7e58dfdd146..631218b4bf8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java
@@ -39,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query;
-import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression;
import com.google.common.collect.ImmutableList;
@@ -66,7 +65,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilde
import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey;
import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL;
import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL;
-import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType;
import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN;
class SubqueryPlanner {
@@ -253,6 +251,10 @@ class SubqueryPlanner {
RelationType descriptor = relationPlan.getDescriptor();
List<Symbol> fieldMappings = relationPlan.getFieldMappings();
Symbol column;
+ checkArgument(
+ descriptor.getVisibleFieldCount() <= 1,
+ "For now, only single column subqueries are supported");
+ /*
if (descriptor.getVisibleFieldCount() > 1) {
column = symbolAllocator.newSymbol("row", type);
@@ -268,8 +270,9 @@ class SubqueryPlanner {
root = new ProjectNode(idAllocator.genPlanNodeId(), root, Assignments.of(column, expression));
} else {
- column = getOnlyElement(fieldMappings);
- }
+ */
+ column = getOnlyElement(fieldMappings);
+ // }
return appendCorrelatedJoin(
subPlan,
@@ -531,8 +534,9 @@ class SubqueryPlanner {
Assignments assignments =
Assignments.builder()
.putIdentities(subPlan.getRoot().getOutputSymbols())
- .put(wrapped, column.toSymbolReference())
// .put(wrapped, new Row(ImmutableList.of(column.toSymbolReference())))
+ // Row Type is not supported for now. So we replace with the following code
+ .put(wrapped, column.toSymbolReference())
.build();
subPlan =
@@ -568,21 +572,20 @@ class SubqueryPlanner {
}
List<Expression> fieldsList = fields.build();
- if (fieldsList.size() > 1) {
- subqueryPlan =
- subqueryPlan.withNewRoot(
- new ProjectNode(
- idAllocator.genPlanNodeId(),
- relationPlan.getRoot(),
- Assignments.of(column, new Cast(new Row(fields.build()), toSqlType(type)))));
- } else {
- subqueryPlan =
- subqueryPlan.withNewRoot(
- new ProjectNode(
- idAllocator.genPlanNodeId(),
- relationPlan.getRoot(),
- Assignments.of(column, fieldsList.get(0))));
- }
+ checkArgument(fieldsList.size() <= 1, "For now, only single column subqueries are supported");
+ /*subqueryPlan =
+ subqueryPlan.withNewRoot(
+ new ProjectNode(
+ idAllocator.genPlanNodeId(),
+ relationPlan.getRoot(),
+ Assignments.of(column, new Cast(new Row(fields.build()), toSqlType(type)))));*/
+
+ subqueryPlan =
+ subqueryPlan.withNewRoot(
+ new ProjectNode(
+ idAllocator.genPlanNodeId(),
+ relationPlan.getRoot(),
+ Assignments.of(column, fieldsList.get(0))));
return coerceIfNecessary(subqueryPlan, column, subquery, coercion);
}
(iotdb) 01/02: remove unnecessary instance of RowType/RowDataType judgement
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lancelly pushed a commit to branch support_uncorrelated_in_predicate
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a07fc9a1e1b74425ebd516ea67d2af9d4ed579c4
Author: lancelly <14...@qq.com>
AuthorDate: Sun Dec 8 17:19:02 2024 +0800
remove unnecessary instance of RowType/RowDataType judgement
---
.../relational/ColumnTransformerBuilder.java | 15 --------
.../plan/planner/TableOperatorGenerator.java | 11 +-----
.../plan/relational/type/InternalTypeManager.java | 40 +---------------------
.../relational/type/TypeSignatureTranslator.java | 23 ++-----------
4 files changed, 4 insertions(+), 85 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
index 3c2faa93fdf..9f9658c9b05 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
@@ -59,8 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral;
-import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row;
-import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowDataType;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral;
@@ -179,7 +177,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral;
import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType;
@@ -353,12 +350,6 @@ public class ColumnTransformerBuilder
Type type;
try {
type = context.metadata.getType(toTypeSignature(node.getType()));
- // For now, we only support casting to scalar types and Row can only have one item.
- if (type instanceof RowDataType) {
- type =
- context.metadata.getType(
- toTypeSignature(((RowDataType) type).getFields().get(0).getType()));
- }
} catch (TypeNotFoundException e) {
throw new SemanticException(String.format("Unknown type: %s", node.getType()));
}
@@ -1431,12 +1422,6 @@ public class ColumnTransformerBuilder
return res;
}
- @Override
- protected ColumnTransformer visitRow(Row node, Context context) {
- checkArgument(node.getItems().size() == 1, "Row should only have one item for now.");
- return process(node.getItems().get(0), context);
- }
-
@Override
protected ColumnTransformer visitTrim(Trim node, Context context) {
throw new UnsupportedOperationException(String.format(UNSUPPORTED_EXPRESSION, node));
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
index 3c2a8f05dfd..8a9342911a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
@@ -164,7 +164,6 @@ import org.apache.tsfile.read.common.block.column.LongColumn;
import org.apache.tsfile.read.common.type.BinaryType;
import org.apache.tsfile.read.common.type.BlobType;
import org.apache.tsfile.read.common.type.BooleanType;
-import org.apache.tsfile.read.common.type.RowType;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.read.common.type.TypeEnum;
import org.apache.tsfile.read.filter.basic.Filter;
@@ -1407,15 +1406,7 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
}
private Type getJoinKeyType(LocalExecutionPlanContext context, Symbol symbol) {
- Type type = context.getTypeProvider().getTableModelType(symbol);
- if (type instanceof RowType) {
- RowType rowType = (RowType) type;
- // For now, we only RowType with single column.
- checkArgument(
- rowType.getFields().size() == 1, "RowType with multiple columns is not supported.");
- return rowType.getFields().get(0).getType();
- }
- return type;
+ return context.getTypeProvider().getTableModelType(symbol);
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java
index a92d9292418..7d64cabb22e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java
@@ -23,13 +23,10 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.read.common.type.TypeEnum;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.iotdb.db.queryengine.plan.relational.type.RowParametricType.ROW;
import static org.apache.tsfile.read.common.type.BinaryType.TEXT;
import static org.apache.tsfile.read.common.type.BlobType.BLOB;
@@ -47,8 +44,6 @@ public class InternalTypeManager implements TypeManager {
private final ConcurrentMap<TypeSignature, Type> types = new ConcurrentHashMap<>();
- private final ConcurrentMap<String, ParametricType> parametricTypes = new ConcurrentHashMap<>();
-
public InternalTypeManager() {
types.put(new TypeSignature(TypeEnum.DOUBLE.name().toLowerCase(Locale.ENGLISH)), DOUBLE);
types.put(new TypeSignature(TypeEnum.FLOAT.name().toLowerCase(Locale.ENGLISH)), FLOAT);
@@ -61,48 +56,15 @@ public class InternalTypeManager implements TypeManager {
types.put(new TypeSignature(TypeEnum.DATE.name().toLowerCase(Locale.ENGLISH)), DATE);
types.put(new TypeSignature(TypeEnum.TIMESTAMP.name().toLowerCase(Locale.ENGLISH)), TIMESTAMP);
types.put(new TypeSignature(TypeEnum.UNKNOWN.name().toLowerCase(Locale.ENGLISH)), UNKNOWN);
-
- addParametricType(ROW);
}
@Override
public Type getType(TypeSignature signature) throws TypeNotFoundException {
Type type = types.get(signature);
if (type == null) {
- return instantiateParametricType(signature);
- }
- return type;
- }
-
- private void addParametricType(ParametricType parametricType) {
- String name = parametricType.getName().toLowerCase(Locale.ENGLISH);
- checkArgument(
- !parametricTypes.containsKey(name), "Parametric type already registered: %s", name);
- parametricTypes.putIfAbsent(name, parametricType);
- }
-
- private Type instantiateParametricType(TypeSignature signature) {
- List<TypeParameter> parameters = new ArrayList<>();
-
- for (TypeSignatureParameter parameter : signature.getParameters()) {
- TypeParameter typeParameter = TypeParameter.of(parameter, this);
- parameters.add(typeParameter);
- }
-
- ParametricType parametricType =
- parametricTypes.get(signature.getBase().toLowerCase(Locale.ENGLISH));
- if (parametricType == null) {
throw new TypeNotFoundException(signature);
}
-
- Type instantiatedType;
- try {
- instantiatedType = parametricType.createType(this, parameters);
- } catch (IllegalArgumentException e) {
- throw new TypeNotFoundException(signature, e);
- }
-
- return instantiatedType;
+ return type;
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java
index 383d81a0e66..ada5fa4b35f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java
@@ -29,13 +29,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowDataType;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter;
import com.google.common.collect.ImmutableList;
-import org.apache.tsfile.read.common.type.RowType;
import org.apache.tsfile.read.common.type.Type;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import java.util.Optional;
import java.util.Set;
import static com.google.common.base.Preconditions.checkArgument;
@@ -51,25 +49,8 @@ public class TypeSignatureTranslator {
private TypeSignatureTranslator() {}
public static DataType toSqlType(Type type) {
- if (type instanceof RowType) {
- RowType rowType = (RowType) type;
- return new RowDataType(
- Optional.empty(),
- rowType.getFields().stream()
- .map(
- field ->
- new RowDataType.Field(
- Optional.empty(),
- field
- .getName()
- .map(RowFieldName::new)
- .map(fieldName -> new Identifier(fieldName.getName(), false)),
- toSqlType(field.getType())))
- .collect(toImmutableList()));
- } else {
- return new GenericDataType(
- new Identifier(type.getTypeEnum().name(), false), Collections.emptyList());
- }
+ return new GenericDataType(
+ new Identifier(type.getTypeEnum().name(), false), Collections.emptyList());
}
public static TypeSignature toTypeSignature(DataType type) {