abhishekagarwal87 commented on code in PR #12386:
URL: https://github.com/apache/druid/pull/12386#discussion_r861664591
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
+ return ImmutableList.of("all");
+ }
+
+ DimFilter dimFilter = convertQueryToDimFilter(replaceTimeQuery,
dateTimeZone);
+ if
(!ImmutableSet.of(ColumnHolder.TIME_COLUMN_NAME).equals(dimFilter.getRequiredColumns()))
{
+ throw new ValidationException("Only " + ColumnHolder.TIME_COLUMN_NAME +
" column is supported in OVERWRITE WHERE clause");
+ }
+
+ Filtration filtration = Filtration.create(dimFilter);
+ filtration = MoveTimeFiltersToIntervals.instance().apply(filtration);
+ List<Interval> intervals = filtration.getIntervals();
Review Comment:
we should make sure that filtration does not have a filter left after
intervals are extracted out.
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
+ return ImmutableList.of("all");
+ }
+
+ DimFilter dimFilter = convertQueryToDimFilter(replaceTimeQuery,
dateTimeZone);
+ if
(!ImmutableSet.of(ColumnHolder.TIME_COLUMN_NAME).equals(dimFilter.getRequiredColumns()))
{
+ throw new ValidationException("Only " + ColumnHolder.TIME_COLUMN_NAME +
" column is supported in OVERWRITE WHERE clause");
+ }
+
+ Filtration filtration = Filtration.create(dimFilter);
+ filtration = MoveTimeFiltersToIntervals.instance().apply(filtration);
+ List<Interval> intervals = filtration.getIntervals();
+
+ for (Interval interval : intervals) {
+ DateTime intervalStart = interval.getStart();
+ DateTime intervalEnd = interval.getEnd();
+ if (!granularity.bucketStart(intervalStart).equals(intervalStart) ||
!granularity.bucketStart(intervalEnd).equals(intervalEnd)) {
+ throw new ValidationException("OVERWRITE WHERE clause contains an
interval which is not aligned with PARTITIONED BY granularity");
+ }
+ }
+ return intervals
+ .stream()
+ .map(AbstractInterval::toString)
+ .collect(Collectors.toList());
+ }
+
+ public static DimFilter convertQueryToDimFilter(SqlNode replaceTimeQuery,
DateTimeZone dateTimeZone)
+ throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlBasicCall) {
Review Comment:
you could avoid multi-level nesting by throwing exception if
replaceTimeQuery is not of type SqlBasicCall
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
+ return ImmutableList.of("all");
+ }
+
+ DimFilter dimFilter = convertQueryToDimFilter(replaceTimeQuery,
dateTimeZone);
+ if
(!ImmutableSet.of(ColumnHolder.TIME_COLUMN_NAME).equals(dimFilter.getRequiredColumns()))
{
+ throw new ValidationException("Only " + ColumnHolder.TIME_COLUMN_NAME +
" column is supported in OVERWRITE WHERE clause");
+ }
+
+ Filtration filtration = Filtration.create(dimFilter);
+ filtration = MoveTimeFiltersToIntervals.instance().apply(filtration);
+ List<Interval> intervals = filtration.getIntervals();
+
+ for (Interval interval : intervals) {
+ DateTime intervalStart = interval.getStart();
+ DateTime intervalEnd = interval.getEnd();
+ if (!granularity.bucketStart(intervalStart).equals(intervalStart) ||
!granularity.bucketStart(intervalEnd).equals(intervalEnd)) {
+ throw new ValidationException("OVERWRITE WHERE clause contains an
interval which is not aligned with PARTITIONED BY granularity");
+ }
+ }
+ return intervals
+ .stream()
+ .map(AbstractInterval::toString)
+ .collect(Collectors.toList());
+ }
+
+ public static DimFilter convertQueryToDimFilter(SqlNode replaceTimeQuery,
DateTimeZone dateTimeZone)
+ throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlBasicCall) {
+ SqlBasicCall sqlBasicCall = (SqlBasicCall) replaceTimeQuery;
+ Pair<String, String> columnValuePair;
+ switch (sqlBasicCall.getOperator().getKind()) {
+ case AND:
+ List<DimFilter> dimFilters = new ArrayList<>();
+ for (SqlNode sqlNode : sqlBasicCall.getOperandList()) {
+ dimFilters.add(convertQueryToDimFilter(sqlNode, dateTimeZone));
+ }
+ return new AndDimFilter(dimFilters);
+ case OR:
+ dimFilters = new ArrayList<>();
+ for (SqlNode sqlNode : sqlBasicCall.getOperandList()) {
+ dimFilters.add(convertQueryToDimFilter(sqlNode, dateTimeZone));
+ }
+ return new OrDimFilter(dimFilters);
+ case NOT:
+ return new
NotDimFilter(convertQueryToDimFilter(sqlBasicCall.getOperandList().get(0),
dateTimeZone));
+ case GREATER_THAN_OR_EQUAL:
+ columnValuePair =
createColumnValuePair(sqlBasicCall.getOperandList(), dateTimeZone);
+ return new BoundDimFilter(columnValuePair.left,
columnValuePair.right, null, false, null, null, null,
StringComparators.NUMERIC);
+ case LESS_THAN_OR_EQUAL:
+ columnValuePair =
createColumnValuePair(sqlBasicCall.getOperandList(), dateTimeZone);
+ return new BoundDimFilter(columnValuePair.left, null,
columnValuePair.right, null, false, null, null, StringComparators.NUMERIC);
+ case GREATER_THAN:
+ columnValuePair =
createColumnValuePair(sqlBasicCall.getOperandList(), dateTimeZone);
+ return new BoundDimFilter(columnValuePair.left,
columnValuePair.right, null, true, null, null, null, StringComparators.NUMERIC);
+ case LESS_THAN:
+ columnValuePair =
createColumnValuePair(sqlBasicCall.getOperandList(), dateTimeZone);
+ return new BoundDimFilter(columnValuePair.left, null,
columnValuePair.right, null, true, null, null, StringComparators.NUMERIC);
+ default:
Review Comment:
we should also add support for BETWEEN if possible.
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
+ return ImmutableList.of("all");
+ }
+
+ DimFilter dimFilter = convertQueryToDimFilter(replaceTimeQuery,
dateTimeZone);
+ if
(!ImmutableSet.of(ColumnHolder.TIME_COLUMN_NAME).equals(dimFilter.getRequiredColumns()))
{
+ throw new ValidationException("Only " + ColumnHolder.TIME_COLUMN_NAME +
" column is supported in OVERWRITE WHERE clause");
+ }
+
+ Filtration filtration = Filtration.create(dimFilter);
+ filtration = MoveTimeFiltersToIntervals.instance().apply(filtration);
+ List<Interval> intervals = filtration.getIntervals();
+
+ for (Interval interval : intervals) {
+ DateTime intervalStart = interval.getStart();
+ DateTime intervalEnd = interval.getEnd();
+ if (!granularity.bucketStart(intervalStart).equals(intervalStart) ||
!granularity.bucketStart(intervalEnd).equals(intervalEnd)) {
+ throw new ValidationException("OVERWRITE WHERE clause contains an
interval which is not aligned with PARTITIONED BY granularity");
+ }
+ }
+ return intervals
+ .stream()
+ .map(AbstractInterval::toString)
+ .collect(Collectors.toList());
+ }
+
+ public static DimFilter convertQueryToDimFilter(SqlNode replaceTimeQuery,
DateTimeZone dateTimeZone)
+ throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlBasicCall) {
Review Comment:
you should also print detailed log that tells us what was the type of
`replaceTimeQuery` if its not SqlBasicCall
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
+ return ImmutableList.of("all");
+ }
+
+ DimFilter dimFilter = convertQueryToDimFilter(replaceTimeQuery,
dateTimeZone);
+ if
(!ImmutableSet.of(ColumnHolder.TIME_COLUMN_NAME).equals(dimFilter.getRequiredColumns()))
{
+ throw new ValidationException("Only " + ColumnHolder.TIME_COLUMN_NAME +
" column is supported in OVERWRITE WHERE clause");
+ }
+
+ Filtration filtration = Filtration.create(dimFilter);
+ filtration = MoveTimeFiltersToIntervals.instance().apply(filtration);
+ List<Interval> intervals = filtration.getIntervals();
+
+ for (Interval interval : intervals) {
+ DateTime intervalStart = interval.getStart();
+ DateTime intervalEnd = interval.getEnd();
+ if (!granularity.bucketStart(intervalStart).equals(intervalStart) ||
!granularity.bucketStart(intervalEnd).equals(intervalEnd)) {
+ throw new ValidationException("OVERWRITE WHERE clause contains an
interval which is not aligned with PARTITIONED BY granularity");
Review Comment:
can you add the `interval` and `granularity` here in the error message?
##########
sql/src/test/java/org/apache/druid/sql/calcite/CalciteReplaceDmlTest.java:
##########
@@ -0,0 +1,608 @@
+/*
+ * 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.druid.sql.calcite;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.granularity.Granularities;
+import org.apache.druid.java.util.common.granularity.Granularity;
+import org.apache.druid.java.util.common.jackson.JacksonUtils;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.query.groupby.GroupByQuery;
+import org.apache.druid.query.scan.ScanQuery;
+import org.apache.druid.segment.column.ColumnType;
+import org.apache.druid.segment.column.RowSignature;
+import org.apache.druid.server.security.ForbiddenException;
+import org.apache.druid.sql.SqlPlanningException;
+import org.apache.druid.sql.calcite.external.ExternalOperatorConversion;
+import org.apache.druid.sql.calcite.filtration.Filtration;
+import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
+import org.apache.druid.sql.calcite.parser.DruidSqlReplace;
+import org.apache.druid.sql.calcite.planner.PlannerConfig;
+import org.apache.druid.sql.calcite.planner.PlannerContext;
+import org.apache.druid.sql.calcite.util.CalciteTests;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
Review Comment:
Please also add tests for negative scenarios where users are trying to use
`REPLACE` in a way that is not supported.
##########
sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java:
##########
@@ -167,4 +189,89 @@ public static Granularity
convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa
TimeFloorOperatorConversion.SQL_FUNCTION_NAME
));
}
+
+ public static List<String> validateQueryAndConvertToIntervals(
+ SqlNode replaceTimeQuery,
+ Granularity granularity,
+ DateTimeZone dateTimeZone
+ ) throws ValidationException
+ {
+ if (replaceTimeQuery instanceof SqlLiteral &&
"all".equalsIgnoreCase(((SqlLiteral) replaceTimeQuery).toValue())) {
Review Comment:
nit - could "all" be pulled into a static string constant?
--
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]
