Skip to content

Validate the param of rand function in compile step #4439

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

Merged
morningman merged 23 commits into from
Sep 2, 2020
Merged

Validate the param of rand function in compile step #4439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1a15f53
udf: replace function
Aug 13, 2020
7d072b9
Merge remote-tracking branch 'upstream/master' into str_replace
Aug 14, 2020
391158f
udf: replace function
Aug 14, 2020
5eb52e1
udf: replace function
Aug 14, 2020
a79ea91
Merge remote-tracking branch 'upstream/master' into str_replace
Aug 18, 2020
86f841f
udf: replace function
Aug 18, 2020
ade1afa
udf: replace function
Aug 18, 2020
1d95a49
udf: replace function
Aug 18, 2020
433eb87
Merge remote-tracking branch 'upstream/master' into str_replace
Aug 24, 2020
313e0a9
rand function validate literal param
Aug 24, 2020
d00fde4
rand function validate literal param
Aug 24, 2020
f01f1f4
validate funtion rand with literal in compile step
Aug 25, 2020
608037f
validate funtion rand with literal in compile step
Aug 25, 2020
a3ee01e
validate funtion rand with literal in compile step
Aug 25, 2020
3089445
validate funtion rand with literal in compile step
Aug 25, 2020
c6f7a9c
validate funtion rand with literal in compile step
Aug 25, 2020
a2f9673
validate funtion rand with literal in compile step
Aug 25, 2020
e0adcef
validate rand function param in compile phase
Aug 27, 2020
3e99267
update
Aug 27, 2020
e714892
Merge remote-tracking branch 'upstream/master' into function_check
Aug 27, 2020
697c5e7
update
Aug 27, 2020
84d3ea8
Merge remote-tracking branch 'upstream/master' into function_check
Aug 28, 2020
a605179
Merge remote-tracking branch 'upstream/master' into function_check
Aug 31, 2020
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
9 changes: 8 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,14 @@ protected Function getBuiltinFunction(
throws AnalysisException {
FunctionName fnName = new FunctionName(name);
Function searchDesc = new Function(fnName, argTypes, Type.INVALID, false);
return Catalog.getCurrentCatalog().getFunction(searchDesc, mode);
Function f = Catalog.getCurrentCatalog().getFunction(searchDesc, mode);
if (f != null && fnName.getFunction().equalsIgnoreCase("rand")) {
if (this.children.size() == 1
&& !(this.children.get(0) instanceof LiteralExpr)) {
throw new AnalysisException("The param of rand function must be literal");
}
}
return f;
}

/**
Expand Down
15 changes: 15 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,21 @@ public void testDataGripSupport() throws Exception {
dorisAssert.query(sql).explainQuery();
}

@Test
public void testRandFunction() throws Exception {
String sql = "select rand(db1.tbl1.k1) from db1.tbl1;";
try {
dorisAssert.query(sql).explainQuery();
Assert.fail("The param of rand function must be literal");
} catch (AnalysisException e) {
System.out.println(e.getMessage());
}
sql = "select rand(1234) from db1.tbl1;";
dorisAssert.query(sql).explainQuery();
sql = "select rand() from db1.tbl1;";
dorisAssert.query(sql).explainQuery();
}

@Test
public void testVarcharToLongSupport() throws Exception {
String sql = "select count(*)\n" +
Expand Down