Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix malformed period throwing ADMIN persona error #16626

Merged
merged 4 commits into from
Jun 20, 2024
Merged

Fix malformed period throwing ADMIN persona error #16626

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff653e
Turn invalid periods into user-facing exception providing more context.
abhishekrb19 Jun 18, 2024
2b9d596
Review comment: pass the wrapping expression and stringify.
abhishekrb19 Jun 18, 2024
1f11fe2
Merge branch 'master' into validate_timestamp_period
abhishekrb19 Jun 19, 2024
e2213c0
Update processing/src/main/java/org/apache/druid/query/expression/Exp…
abhishekrb19 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions processing/src/main/java/org/apache/druid/query/expression/ExprUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.druid.query.expression;

import org.apache.druid.common.config.NullHandling;
import org.apache.druid.error.InvalidInput;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.java.util.common.granularity.PeriodGranularity;
Expand All @@ -45,13 +46,23 @@ static DateTimeZone toTimeZone(final Expr timeZoneArg)
}

static PeriodGranularity toPeriodGranularity(
final Expr wrappingExpr,
final Expr periodArg,
@Nullable final Expr originArg,
@Nullable final Expr timeZoneArg,
final Expr.ObjectBinding bindings
)
{
final Period period = new Period(periodArg.eval(bindings).asString());
final Period period;
try {
period = new Period(periodArg.eval(bindings).asString());
}
catch (IllegalArgumentException iae) {
throw InvalidInput.exception(
"Invalid period[%s] specified for expression[%s]: [%s]",
periodArg.stringify(), wrappingExpr.stringify(), iae.getMessage()
);
abhishekrb19 marked this conversation as resolved.
Show resolved Hide resolved
}
final DateTime origin;
final DateTimeZone timeZone;

Expand All @@ -69,7 +80,7 @@ static PeriodGranularity toPeriodGranularity(
final Object value = originArg.eval(bindings).valueOrDefault();
if (value instanceof String && NullHandling.isNullOrEquivalent((String) value)) {
// We get a blank string here, when sql compatible null handling is enabled
// and expression contains empty string for for origin
// and expression contains empty string for origin
// e.g timestamp_floor(\"__time\",'PT1M','','UTC')
origin = null;
} else {
Expand Down
11 changes: 8 additions & 3 deletions processing/src/main/java/org/apache/druid/query/expression/TimestampCeilExprMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static class TimestampCeilExpr extends ExprMacroTable.BaseScalarMacroFunctionExp
TimestampCeilExpr(final TimestampCeilExprMacro macro, final List<Expr> args)
{
super(macro, args);
this.granularity = getGranularity(args, InputBindings.nilBindings());
this.granularity = getGranularity(this, args, InputBindings.nilBindings());
}

@Nonnull
Expand Down Expand Up @@ -113,9 +113,14 @@ public int hashCode()
}
}

private static PeriodGranularity getGranularity(final List<Expr> args, final Expr.ObjectBinding bindings)
private static PeriodGranularity getGranularity(
final Expr expr,
final List<Expr> args,
final Expr.ObjectBinding bindings
)
{
return ExprUtils.toPeriodGranularity(
expr,
args.get(1),
args.size() > 2 ? args.get(2) : null,
args.size() > 3 ? args.get(3) : null,
Expand All @@ -135,7 +140,7 @@ static class TimestampCeilDynamicExpr extends ExprMacroTable.BaseScalarMacroFunc
@Override
public ExprEval eval(final ObjectBinding bindings)
{
final PeriodGranularity granularity = getGranularity(args, bindings);
final PeriodGranularity granularity = getGranularity(this, args, bindings);
long argTime = args.get(0).eval(bindings).asLong();
long bucketStartTime = granularity.bucketStart(argTime);
if (argTime == bucketStartTime) {
Expand Down
11 changes: 8 additions & 3 deletions processing/src/main/java/org/apache/druid/query/expression/TimestampFloorExprMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,14 @@ public Expr apply(final List<Expr> args)
}
}

private static PeriodGranularity computeGranularity(final List<Expr> args, final Expr.ObjectBinding bindings)
private static PeriodGranularity computeGranularity(
final Expr expr,
final List<Expr> args,
final Expr.ObjectBinding bindings
)
{
return ExprUtils.toPeriodGranularity(
expr,
args.get(1),
args.size() > 2 ? args.get(2) : null,
args.size() > 3 ? args.get(3) : null,
Expand All @@ -73,7 +78,7 @@ public static class TimestampFloorExpr extends ExprMacroTable.BaseScalarMacroFun
TimestampFloorExpr(final TimestampFloorExprMacro macro, final List<Expr> args)
{
super(macro, args);
this.granularity = computeGranularity(args, InputBindings.nilBindings());
this.granularity = computeGranularity(this, args, InputBindings.nilBindings());
}

/**
Expand Down Expand Up @@ -170,7 +175,7 @@ public static class TimestampFloorDynamicExpr extends ExprMacroTable.BaseScalarM
@Override
public ExprEval eval(final ObjectBinding bindings)
{
final PeriodGranularity granularity = computeGranularity(args, bindings);
final PeriodGranularity granularity = computeGranularity(this, args, bindings);
return ExprEval.of(granularity.bucketStart(args.get(0).eval(bindings).asLong()));
}

Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/org/apache/druid/sql/calcite/planner/CalcitePlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ private void ready()

state = CalcitePlanner.State.STATE_2_READY;

// If user specify own traitDef, instead of default default trait,
// If user specifies own traitDef, instead of default trait,
// register the trait def specified in traitDefs.
if (this.traitDefs == null) {
planner.addRelTraitDef(ConventionTraitDef.INSTANCE);
Expand Down
23 changes: 23 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.error.DruidExceptionMatcher;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.granularity.Granularities;
Expand Down Expand Up @@ -130,6 +131,28 @@ public void testExpressionContainingNull()
);
}

@Test
public void testTimeCeilExpressionContainingInvalidPeriod()
{
testQueryThrows(
"SELECT TIME_CEIL(__time, 'PT1Y') FROM foo",
DruidExceptionMatcher.invalidInput().expectMessageContains(
"Invalid period['PT1Y'] specified for expression[timestamp_ceil(\"__time\", 'PT1Y', null, 'UTC')]"
)
);
}

@Test
public void testTimeFloorExpressionContainingInvalidPeriod()
{
testQueryThrows(
"SELECT TIME_FLOOR(TIMESTAMPADD(DAY, -1, __time), 'PT1D') FROM foo",
DruidExceptionMatcher.invalidInput().expectMessageContains(
"Invalid period['PT1D'] specified for expression[timestamp_floor((\"__time\" + -86400000), 'PT1D', null, 'UTC')]"
)
);
}

@Test
public void testValuesContainingNull()
{
Expand Down
Loading