Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Massive refactoring of modules handling SQL functions to allow for ne…
Browse files Browse the repository at this point in the history 
…sting
  • Loading branch information
@cip999
cip999 committed Aug 24, 2021
1 parent 83107e0 commit ccbbe49
Show file tree
Hide file tree
Showing 11 changed files with 382 additions and 352 deletions.
15 changes: 14 additions & 1 deletion ...g-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/legacy/SQLFunctionsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,20 @@ public void greatestWithAliasAndStrings() throws Exception {
rows("duke"),
rows("hattie"),
rows("nanette"));
}
}

@Test
public void complexNestedFunctions() throws Exception {
JSONObject response =
executeJdbcRequest("SELECT if(greatest(account_number / 2, age - 2) = 34, "
+ "concat_ws(' ', firstname, lastname), 0) "
+ "FROM " + TEST_INDEX_ACCOUNT + " LIMIT 3");

verifyDataRows(response,
rows(0),
rows("hattie bond"),
rows(0));
}

private SearchHits query(String query) throws IOException {
final String rsp = executeQueryWithStringOutput(query);
Expand Down
6 changes: 4 additions & 2 deletions ...n/opendistroforelasticsearch/sql/legacy/antlr/semantic/types/function/ScalarFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ public enum ScalarFunction implements TypeExpression {
CURDATE(func().to(ESDataType.DATE)),
DATE(func(ESDataType.DATE).to(ESDataType.DATE)),
DATE_FORMAT(
func(ESDataType.DATE, STRING).to(STRING),
func(ESDataType.DATE, STRING, STRING).to(STRING)
func(ESDataType.DATE, STRING).to(STRING),
func(ESDataType.DATE, STRING, STRING).to(STRING),
func(T(STRING), STRING).to(STRING),
func(T(STRING), STRING, STRING).to(STRING)
),
DAYOFMONTH(func(ESDataType.DATE).to(INTEGER)),
DEGREES(func(T(NUMBER)).to(DOUBLE)),
Expand Down
90 changes: 55 additions & 35 deletions legacy/src/main/java/com/amazon/opendistroforelasticsearch/sql/legacy/parser/FieldMaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,7 @@
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLSetQuantifier;
import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLCaseExpr;
import com.alibaba.druid.sql.ast.expr.SQLCastExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.expr.*;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
Expand All @@ -41,6 +29,7 @@
import com.amazon.opendistroforelasticsearch.sql.legacy.domain.Where;
import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SqlFeatureNotImplementedException;
import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SqlParseException;
import com.amazon.opendistroforelasticsearch.sql.legacy.utils.SQLDefinitionExpr;
import com.amazon.opendistroforelasticsearch.sql.legacy.utils.SQLFunctions;
import com.amazon.opendistroforelasticsearch.sql.legacy.utils.Util;
import com.google.common.base.Strings;
Expand Down Expand Up @@ -127,7 +116,7 @@ private Field makeFieldImpl(SQLExpr expr, String alias, String tableAlias) throw
return makeMethodField(methodInvokeExpr.getMethodName(), methodInvokeExpr.getParameters(),
null, alias, tableAlias, true);
} else {
throw new SqlParseException("unknown field name : " + expr);
throw new SqlParseException("unknown field name: " + expr);
}
}

Expand Down Expand Up @@ -165,15 +154,48 @@ private Field makeScriptMethodField(SQLBinaryOpExpr binaryExpr, String alias, St
}
params.add(new SQLCharExpr(scriptFieldAlias));

Object left = getScriptValue(binaryExpr.getLeft());
Object right = getScriptValue(binaryExpr.getRight());
String script = String.format("%s %s %s", left, binaryExpr.getOperator().getName(), right);
Tuple<String, SQLExpr> left = processOperand(binaryExpr.getLeft(), tableAlias);
Tuple<String, SQLExpr> right = processOperand(binaryExpr.getRight(), tableAlias);

String operator = binaryExpr.getOperator().getName();
if (operator.equals("=")) {
operator = "==";
}

String script = String.format("%s %s %s", left.v1(), operator, right.v1());

params.add(new SQLCharExpr(script));
params.add(left.v2());
params.add(right.v2());

return makeMethodField("script", params, null, null, tableAlias, false);
}

private Tuple<String, SQLExpr> processOperand(SQLExpr expr, String tableAlias)
throws SqlParseException {
if (expr instanceof SQLBinaryOpExpr) {
SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr;
if (SQLFunctions.isFunctionTranslatedToScript(binaryOpExpr.getOperator().toString())) {
SQLMethodInvokeExpr mExpr = makeBinaryMethodField(binaryOpExpr, null, false);
MethodField mField = makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
null, null, tableAlias, false);
String varName = mField.getParams().get(0).toString();
return new Tuple<>(varName, new SQLDefinitionExpr(varName, mField.getParams().get(1).toString()));
} else {
throw new SqlParseException("Invalid operand: "
+ "valuable expression expected, found "
+ binaryOpExpr.toString());
}
} else if (expr instanceof SQLMethodInvokeExpr) {
SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) expr;
MethodField mField = makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
null, null, tableAlias, false);
String varName = mField.getParams().get(0).toString();
return new Tuple<>(varName, new SQLDefinitionExpr(varName, mField.getParams().get(1).toString()));
} else {
return new Tuple<>(getScriptValue(expr).toString(), new SQLNullExpr());
}
}

private static Field makeFilterMethodField(SQLMethodInvokeExpr filterMethod, String alias)
throws SqlParseException {
Expand Down Expand Up @@ -292,26 +314,22 @@ public MethodField makeMethodField(String name, List<SQLExpr> arguments, SQLAggr

if (SQLFunctions.isFunctionTranslatedToScript(binaryOpExpr.getOperator().toString())) {
SQLMethodInvokeExpr mExpr = makeBinaryMethodField(binaryOpExpr, alias, first);
MethodField abc = makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
MethodField mField = makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
null, null, tableAlias, false);
paramers.add(new KVValue(abc.getParams().get(0).toString(),
new SQLCharExpr(abc.getParams().get(1).toString())));
String varName = mField.getParams().get(0).toString();
paramers.add(new KVValue(varName,
new SQLDefinitionExpr(varName, mField.getParams().get(1).toString())
));
} else {
if (!binaryOpExpr.getOperator().getName().equals("=")) {
paramers.add(new KVValue("script", makeScriptMethodField(binaryOpExpr, null, tableAlias)));
} else {
SQLExpr right = binaryOpExpr.getRight();
Object value = Util.expr2Object(right);
paramers.add(new KVValue(binaryOpExpr.getLeft().toString(), value));
}
paramers.add(new KVValue("script", makeScriptMethodField(binaryOpExpr, null, tableAlias)));
}

} else if (object instanceof SQLMethodInvokeExpr) {
SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) object;
String methodName = mExpr.getMethodName().toLowerCase();
if (methodName.equals("script")) {
KVValue script = new KVValue("script", makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
null, alias, tableAlias, true));
KVValue script = new KVValue("script", makeMethodField(mExpr.getMethodName(),
mExpr.getParameters(), null, alias, tableAlias, true));
paramers.add(script);
} else if (methodName.equals("nested") || methodName.equals("reverse_nested")) {
NestedType nestedType = new NestedType();
Expand All @@ -332,19 +350,21 @@ public MethodField makeMethodField(String name, List<SQLExpr> arguments, SQLAggr
paramers.add(new KVValue("children", childrenType));
} else if (SQLFunctions.isFunctionTranslatedToScript(methodName)) {
//throw new SqlParseException("only support script/nested as inner functions");
MethodField abc = makeMethodField(methodName, mExpr.getParameters(), null, null, tableAlias, false);
paramers.add(new KVValue(abc.getParams().get(0).toString(),
new SQLCharExpr(abc.getParams().get(1).toString())));
MethodField mField = makeMethodField(methodName, mExpr.getParameters(),
null, null, tableAlias, false);
String varName = mField.getParams().get(0).toString();
paramers.add(new KVValue(varName,
new SQLDefinitionExpr(varName, mField.getParams().get(1).toString())));
} else {
throw new SqlParseException("only support script/nested/children as inner functions");
}
} else if (object instanceof SQLCaseExpr) {
String scriptCode = new CaseWhenParser((SQLCaseExpr) object, alias, tableAlias).parse();
paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
paramers.add(new KVValue("script", new SQLDefinitionExpr("script", scriptCode)));
} else if (object instanceof SQLCastExpr) {
String castName = sqlFunctions.nextId("cast");
List<KVValue> methodParameters = new ArrayList<>();
methodParameters.add(new KVValue(((SQLCastExpr) object).getExpr().toString()));
methodParameters.add(new KVValue(((SQLCastExpr) object).getExpr()));
String castType = ((SQLCastExpr) object).getDataType().getName();
String scriptCode = sqlFunctions.getCastScriptStatement(castName, castType, methodParameters);

Expand All @@ -356,7 +376,7 @@ public MethodField makeMethodField(String name, List<SQLExpr> arguments, SQLAggr
scriptCode += "; return " + castName;
}
methodParameters.add(new KVValue(scriptCode));
paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
paramers.add(new KVValue("script", new SQLDefinitionExpr("script", scriptCode)));
} else if (object instanceof SQLAggregateExpr) {
SQLObject parent = object.getParent();
SQLExpr source = (SQLExpr) parent.getAttribute("source");
Expand Down
Loading

0 comments on commit ccbbe49

Please sign in to comment.