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

[enhance](function) add more signatures for lag/lead fucntion #47940

Merged
merged 6 commits into from
Feb 19, 2025
Merged

[enhance](function) add more signatures for lag/lead fucntion #47940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2defb4a
[enhance](function) add more signatures for lag/lead fucntion
zhangstar333 Feb 14, 2025
e75f155
update case
zhangstar333 Feb 17, 2025
5a54c59
update case
zhangstar333 Feb 17, 2025
b8f22de
update unstable case
zhangstar333 Feb 17, 2025
f4f12ba
update error msg
zhangstar333 Feb 18, 2025
82df9e1
update checkArgument
zhangstar333 Feb 18, 2025
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
34 changes: 22 additions & 12 deletions ...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/window/Lag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
import org.apache.doris.nereids.trees.expressions.shape.TernaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.BigIntType;
Expand All @@ -39,9 +41,11 @@ public class Lag extends WindowFunction implements TernaryExpression, Explicitly

static {
List<FunctionSignature> signatures = Lists.newArrayList();
trivialTypes.forEach(t ->
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE, t))
);
trivialTypes.forEach(t -> {
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE, t));
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE));
signatures.add(FunctionSignature.ret(t).args(t));
});
SIGNATURES = ImmutableList.copyOf(signatures);
}

Expand All @@ -51,21 +55,21 @@ public Lag(Expression child, Expression offset, Expression defaultValue) {
super("lag", child, offset, defaultValue);
}

private Lag(List<Expression> children) {
super("lag", children);
public Lag(Expression child, Expression offset) {
this(child, offset, new NullLiteral(child.getDataType()));
}

public Lag(Expression child) {
this(child, new BigIntLiteral(1L), new NullLiteral(child.getDataType()));
}

public Expression getOffset() {
if (children().size() <= 1) {
throw new AnalysisException("Not set offset of Lead(): " + this.toSql());
}
Preconditions.checkArgument(children.size() == 3);
return child(1);
}

public Expression getDefaultValue() {
if (children.size() <= 2) {
throw new AnalysisException("Not set default value of Lead(): " + this.toSql());
}
Preconditions.checkArgument(children.size() == 3);
return child(2);
}

Expand All @@ -80,7 +84,13 @@ public boolean nullable() {
@Override
public Lag withChildren(List<Expression> children) {
Preconditions.checkArgument(children.size() >= 1 && children.size() <= 3);
return new Lag(children);
if (children.size() == 1) {
return new Lag(children.get(0));
} else if (children.size() == 2) {
return new Lag(children.get(0), children.get(1));
} else {
return new Lag(children.get(0), children.get(1), children.get(2));
}
}

@Override
Expand Down
34 changes: 22 additions & 12 deletions ...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/window/Lead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
import org.apache.doris.nereids.trees.expressions.shape.TernaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.BigIntType;
Expand All @@ -41,9 +43,11 @@ public class Lead extends WindowFunction implements TernaryExpression, Explicitl

static {
List<FunctionSignature> signatures = Lists.newArrayList();
trivialTypes.forEach(t ->
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE, t))
);
trivialTypes.forEach(t -> {
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE, t));
signatures.add(FunctionSignature.ret(t).args(t, BigIntType.INSTANCE));
signatures.add(FunctionSignature.ret(t).args(t));
});
SIGNATURES = ImmutableList.copyOf(signatures);
}

Expand All @@ -53,21 +57,21 @@ public Lead(Expression child, Expression offset, Expression defaultValue) {
super("lead", child, offset, defaultValue);
}

private Lead(List<Expression> children) {
super("lead", children);
public Lead(Expression child, Expression offset) {
this(child, offset, new NullLiteral(child.getDataType()));
}

public Lead(Expression child) {
this(child, new BigIntLiteral(1L), new NullLiteral(child.getDataType()));
}

public Expression getOffset() {
if (children().size() <= 1) {
throw new AnalysisException("Not set offset of Lead(): " + this.toSql());
}
Preconditions.checkArgument(children.size() == 3);
return child(1);
}

public Expression getDefaultValue() {
if (children.size() <= 2) {
throw new AnalysisException("Not set default value of Lead(): " + this.toSql());
}
Preconditions.checkArgument(children.size() == 3);
return child(2);
}

Expand Down Expand Up @@ -114,7 +118,13 @@ public List<FunctionSignature> getSignatures() {
@Override
public Lead withChildren(List<Expression> children) {
Preconditions.checkArgument(children.size() >= 1 && children.size() <= 3);
return new Lead(children);
if (children.size() == 1) {
return new Lead(children.get(0));
} else if (children.size() == 2) {
return new Lead(children.get(0), children.get(1));
} else {
return new Lead(children.get(0), children.get(1), children.get(2));
}
}

@Override
Expand Down
30 changes: 30 additions & 0 deletions regression-test/data/correctness_p0/test_lag_lead_window.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,33 @@ c 2022-09-06T00:00:02 2022-09-06T00:00:01
b 2022-09-06T00:00:01 2022-09-06T00:00
a 2022-09-06T00:00 2022-08-30T00:00

-- !select_lag_1 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

-- !select_lag_2 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

-- !select_lag_3 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

-- !select_lag_4 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

-- !select_lag_5 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

-- !select_lag_6 --
a 2022-09-06T00:00 \N
b 2022-09-06T00:00:01 \N
c 2022-09-06T00:00:02 \N

72 changes: 72 additions & 0 deletions regression-test/data/nereids_p0/sql_functions/window_functions/test_window_function.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,78 @@ USA Pete Hello
9223372036854775807 1
9223372036854775807 2

-- !lag_1 --
\N \N \N
-9223372036854775807 false \N
-9223372036854775807 true false
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false \N
11011902 true false
11011902 true true
11011903 false \N
11011905 false \N
11011920 true \N
11011920 true true
9223372036854775807 false \N
9223372036854775807 false false

-- !lag_2 --
\N \N \N
-9223372036854775807 false \N
-9223372036854775807 true false
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false \N
11011902 true false
11011902 true true
11011903 false \N
11011905 false \N
11011920 true \N
11011920 true true
9223372036854775807 false \N
9223372036854775807 false false

-- !lead_1 --
\N \N \N
-9223372036854775807 false true
-9223372036854775807 true \N
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false true
11011902 true true
11011902 true \N
11011903 false \N
11011905 false \N
11011920 true true
11011920 true \N
9223372036854775807 false false
9223372036854775807 false \N

-- !lead_2 --
\N \N \N
-9223372036854775807 false true
-9223372036854775807 true \N
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false true
11011902 true true
11011902 true \N
11011903 false \N
11011905 false \N
11011920 true true
11011920 true \N
9223372036854775807 false false
9223372036854775807 false \N

-- !window_error1 --
\N \N
-9223372036854775807 true
Expand Down
72 changes: 72 additions & 0 deletions regression-test/data/query_p0/sql_functions/window_functions/test_window_function.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,78 @@ USA Pete Hello
9223372036854775807 1
9223372036854775807 2

-- !lag_1 --
\N \N \N
-9223372036854775807 false \N
-9223372036854775807 true false
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false \N
11011902 true false
11011902 true true
11011903 false \N
11011905 false \N
11011920 true \N
11011920 true true
9223372036854775807 false \N
9223372036854775807 false false

-- !lag_2 --
\N \N \N
-9223372036854775807 false \N
-9223372036854775807 true false
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false \N
11011902 true false
11011902 true true
11011903 false \N
11011905 false \N
11011920 true \N
11011920 true true
9223372036854775807 false \N
9223372036854775807 false false

-- !lead_1 --
\N \N \N
-9223372036854775807 false true
-9223372036854775807 true \N
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false true
11011902 true true
11011902 true \N
11011903 false \N
11011905 false \N
11011920 true true
11011920 true \N
9223372036854775807 false false
9223372036854775807 false \N

-- !lead_2 --
\N \N \N
-9223372036854775807 false true
-9223372036854775807 true \N
-11011907 false \N
-11011903 true \N
123456 true \N
7210457 false \N
11011902 false true
11011902 true true
11011902 true \N
11011903 false \N
11011905 false \N
11011920 true true
11011920 true \N
9223372036854775807 false false
9223372036854775807 false \N

-- !window_error1 --
\N \N
-9223372036854775807 true
Expand Down
9 changes: 9 additions & 0 deletions regression-test/suites/correctness_p0/test_lag_lead_window.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,14 @@ suite("test_lag_lead_window") {
qt_select_default """ select id, create_time, lead(create_time, 1, '2022-09-06 00:00:00') over
(order by create_time desc) as "prev_time" from test1; """
qt_select_default """ select id, create_time, lead(create_time, 1, date_sub('2022-09-06 00:00:00', interval 7 day)) over (order by create_time desc) as "prev_time" from test1; """

qt_select_lag_1 """ select id, create_time, lag(create_time) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """
qt_select_lag_2 """ select id, create_time, lag(create_time,1) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """
qt_select_lag_3 """ select id, create_time, lag(create_time,1,NULL) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """
qt_select_lag_4 """ select id, create_time, lead(create_time) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """
qt_select_lag_5 """ select id, create_time, lead(create_time,1) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """
qt_select_lag_6 """ select id, create_time, lead(create_time,1,NULL) over(partition by id) as "prev_time" from test1 order by 1 ,2 ; """

sql """ DROP TABLE IF EXISTS test1 """

}
27 changes: 10 additions & 17 deletions regression-test/suites/nereids_p0/sql_functions/window_functions/test_window_function.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,31 +366,24 @@ suite("test_window_function") {
rows between unbounded preceding and current row)
as wj from baseall order by ${k1}, wj"""

// test error
test {
sql("select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lag(${k2}) over (partition by ${k1} order by ${k3}) from baseall")
exception ""
}
qt_lag_1 "select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1},${k2}, lag(${k2}) over (partition by ${k1} order by ${k3},${k2}) from baseall order by 1,2;"

test {
sql"select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lag(${k2}, -1, 1) over (partition by ${k1} order by ${k3}) from baseall"
exception ""
}
test {
sql"select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lag(${k2}, 1) over (partition by ${k1} order by ${k3}) from baseall"
exception ""
}
test {
sql"select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lead(${k2}) over (partition by ${k1} order by ${k3}) from baseall"
exception ""
}

qt_lag_2 "select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, ${k2}, lag(${k2}, 1) over (partition by ${k1} order by ${k3},${k2}) from baseall order by 1,2;"

qt_lead_1 "select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, ${k2}, lead(${k2}) over (partition by ${k1} order by ${k3},${k2}) from baseall order by 1,2;"

test {
sql"select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lead(${k2}, -1, 1) over (partition by ${k1} order by ${k3}) from baseall"
exception ""
}
test {
sql"select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, lead(${k2}, 1) over (partition by ${k1} order by ${k3}) from baseall"
exception ""
}

qt_lead_2 "select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, ${k2}, lead(${k2}, 1) over (partition by ${k1} order by ${k3},${k2}) from baseall order by 1,2;"

qt_window_error1"""select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, first_value(${k2}) over (partition by ${k1}) from baseall order by ${k1}"""
qt_window_error2"""select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, first_value(${k2}) over (order by ${k3}) from baseall"""
qt_window_error3"""select /*+SET_VAR(parallel_pipeline_task_num=1) */ ${k1}, max(${k2}) over (order by ${k3}) from baseall"""
Expand Down
Loading