Skip to content

Commit

Permalink
Removed ExpressionUtil utility class
Browse files Browse the repository at this point in the history
  • Loading branch information
@vruusmann
vruusmann committed Feb 10, 2024
1 parent 70e2e86 commit ef6cf30
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 77 deletions.
87 changes: 44 additions & 43 deletions pmml-sparkml/src/main/java/org/jpmml/sparkml/ExpressionTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import org.dmg.pmml.HasDataType;
import org.dmg.pmml.OpType;
import org.dmg.pmml.PMMLFunctions;
import org.jpmml.converter.ExpressionUtil;
import org.jpmml.converter.FieldNameUtil;
import org.jpmml.converter.IfElseBuilder;
import org.jpmml.converter.TypeUtil;
Expand Down Expand Up @@ -182,7 +183,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
throw new IllegalArgumentException(formatMessage(binaryMathExpression));
}

return org.jpmml.converter.ExpressionUtil.createApply(function, translateInternal(left), translateInternal(right));
return ExpressionUtil.createApply(function, translateInternal(left), translateInternal(right));
} else

if(expression instanceof BinaryOperator){
Expand Down Expand Up @@ -258,7 +259,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
throw new IllegalArgumentException(formatMessage(binaryOperator));
}

return org.jpmml.converter.ExpressionUtil.createApply(function, translateInternal(left), translateInternal(right));
return ExpressionUtil.createApply(function, translateInternal(left), translateInternal(right));
} else

if(expression instanceof CaseWhen){
Expand Down Expand Up @@ -317,7 +318,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
} else

{
name = FieldNameUtil.create(dataType, ExpressionUtil.format(child));
name = FieldNameUtil.create(dataType, String.valueOf(child));
}

OpType opType = TypeUtil.getOpType(dataType);
Expand All @@ -335,7 +336,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){

List<Expression> children = JavaConversions.seqAsJavaList(concat.children());

Apply apply = org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.CONCAT);
Apply apply = ExpressionUtil.createApply(PMMLFunctions.CONCAT);

for(Expression child : children){
apply.addExpressions(translateInternal(child));
Expand All @@ -349,7 +350,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){

List<Expression> children = JavaConversions.seqAsJavaList(greatest.children());

Apply apply = org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.MAX);
Apply apply = ExpressionUtil.createApply(PMMLFunctions.MAX);

for(Expression child : children){
apply.addExpressions(translateInternal(child));
Expand All @@ -366,7 +367,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
Expression trueValue = _if.trueValue();
Expression falseValue = _if.falseValue();

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.IF,
return ExpressionUtil.createApply(PMMLFunctions.IF,
translateInternal(predicate),
translateInternal(trueValue),
translateInternal(falseValue)
Expand All @@ -380,7 +381,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){

List<Expression> elements = JavaConversions.seqAsJavaList(in.list());

Apply apply = org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ISIN, translateInternal(value));
Apply apply = ExpressionUtil.createApply(PMMLFunctions.ISIN, translateInternal(value));

for(Expression element : elements){
apply.addExpressions(translateInternal(element));
Expand All @@ -394,7 +395,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){

List<Expression> children = JavaConversions.seqAsJavaList(least.children());

Apply apply = org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.MIN);
Apply apply = ExpressionUtil.createApply(PMMLFunctions.MIN);

for(Expression child : children){
apply.addExpressions(translateInternal(child));
Expand All @@ -408,15 +409,15 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){

Expression child = length.child();

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.STRINGLENGTH, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.STRINGLENGTH, translateInternal(child));
} else

if(expression instanceof Literal){
Literal literal = (Literal)expression;

Object value = literal.value();
if(value == null){
return org.jpmml.converter.ExpressionUtil.createMissingConstant();
return ExpressionUtil.createMissingConstant();
}

DataType dataType;
Expand All @@ -436,7 +437,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
value = toSimpleObject(value);
}

return org.jpmml.converter.ExpressionUtil.createConstant(dataType, value);
return ExpressionUtil.createConstant(dataType, value);
} else

if(expression instanceof RegExpReplace){
Expand All @@ -446,7 +447,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
Expression regexp = regexpReplace.regexp();
Expression rep = regexpReplace.rep();

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.REPLACE, translateInternal(subject), translateInternal(regexp), translateInternal(rep));
return ExpressionUtil.createApply(PMMLFunctions.REPLACE, translateInternal(subject), translateInternal(regexp), translateInternal(rep));
} else

if(expression instanceof RLike){
Expand All @@ -455,7 +456,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
Expression left = rlike.left();
Expression right = rlike.right();

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.MATCHES, translateInternal(left), translateInternal(right));
return ExpressionUtil.createApply(PMMLFunctions.MATCHES, translateInternal(left), translateInternal(right));
} else

if(expression instanceof StringReplace){
Expand All @@ -465,7 +466,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
Expression searchExpr = stringReplace.searchExpr();
Expression replaceExpr = stringReplace.replaceExpr();

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.REPLACE, translateInternal(srcExpr), transformString(translateInternal(searchExpr), ExpressionTranslator::escapeSearchString), transformString(translateInternal(replaceExpr), ExpressionTranslator::escapeReplacementString));
return ExpressionUtil.createApply(PMMLFunctions.REPLACE, translateInternal(srcExpr), transformString(translateInternal(searchExpr), ExpressionTranslator::escapeSearchString), transformString(translateInternal(replaceExpr), ExpressionTranslator::escapeReplacementString));
} else

if(expression instanceof StringTrim){
Expand All @@ -477,7 +478,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
throw new IllegalArgumentException();
}

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.TRIMBLANKS, translateInternal(srcStr));
return ExpressionUtil.createApply(PMMLFunctions.TRIMBLANKS, translateInternal(srcStr));
} else

if(expression instanceof Substring){
Expand All @@ -497,7 +498,7 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
// XXX
lenValue = Math.min(lenValue, MAX_STRING_LENGTH);

return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.SUBSTRING, translateInternal(str), org.jpmml.converter.ExpressionUtil.createConstant(posValue), org.jpmml.converter.ExpressionUtil.createConstant(lenValue));
return ExpressionUtil.createApply(PMMLFunctions.SUBSTRING, translateInternal(str), ExpressionUtil.createConstant(posValue), ExpressionUtil.createConstant(lenValue));
} else

if(expression instanceof UnaryExpression){
Expand All @@ -506,112 +507,112 @@ private org.dmg.pmml.Expression translateInternal(Expression expression){
Expression child = unaryExpression.child();

if(expression instanceof Abs){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ABS, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ABS, translateInternal(child));
} else

if(expression instanceof Acos){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ACOS, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ACOS, translateInternal(child));
} else

if(expression instanceof Asin){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ASIN, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ASIN, translateInternal(child));
} else

if(expression instanceof Atan){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ATAN, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ATAN, translateInternal(child));
} else

if(expression instanceof Ceil){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.CEIL, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.CEIL, translateInternal(child));
} else

if(expression instanceof Cos){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.COS, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.COS, translateInternal(child));
} else

if(expression instanceof Cosh){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.COSH, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.COSH, translateInternal(child));
} else

if(expression instanceof Exp){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.EXP, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.EXP, translateInternal(child));
} else

if(expression instanceof Expm1){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.EXPM1, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.EXPM1, translateInternal(child));
} else

if(expression instanceof Floor){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.FLOOR, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.FLOOR, translateInternal(child));
} else

if(expression instanceof Log){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.LN, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.LN, translateInternal(child));
} else

if(expression instanceof Log10){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.LOG10, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.LOG10, translateInternal(child));
} else

if(expression instanceof Log1p){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.LN1P, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.LN1P, translateInternal(child));
} else

if(expression instanceof Lower){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.LOWERCASE, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.LOWERCASE, translateInternal(child));
} else

if(expression instanceof IsNaN){
// XXX
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ISNOTVALID, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ISNOTVALID, translateInternal(child));
} else

if(expression instanceof IsNotNull){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ISNOTMISSING, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ISNOTMISSING, translateInternal(child));
} else

if(expression instanceof IsNull){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.ISMISSING, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.ISMISSING, translateInternal(child));
} else

if(expression instanceof Not){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.NOT, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.NOT, translateInternal(child));
} else

if(expression instanceof Rint){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.RINT, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.RINT, translateInternal(child));
} else

if(expression instanceof Sin){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.SIN, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.SIN, translateInternal(child));
} else

if(expression instanceof Sinh){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.SINH, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.SINH, translateInternal(child));
} else

if(expression instanceof Sqrt){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.SQRT, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.SQRT, translateInternal(child));
} else

if(expression instanceof Tan){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.TAN, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.TAN, translateInternal(child));
} else

if(expression instanceof Tanh){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.TANH, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.TANH, translateInternal(child));
} else

if(expression instanceof UnaryMinus){
return org.jpmml.converter.ExpressionUtil.toNegative(translateInternal(child));
return ExpressionUtil.toNegative(translateInternal(child));
} else

if(expression instanceof UnaryPositive){
return translateInternal(child);
} else

if(expression instanceof Upper){
return org.jpmml.converter.ExpressionUtil.createApply(PMMLFunctions.UPPERCASE, translateInternal(child));
return ExpressionUtil.createApply(PMMLFunctions.UPPERCASE, translateInternal(child));
} else

{
Expand Down Expand Up @@ -682,7 +683,7 @@ private String formatMessage(Expression expression){
return null;
}

return "Spark SQL function \'" + ExpressionUtil.format(expression) + "\' (class " + (expression.getClass()).getName() + ") is not supported";
return "Spark SQL function \'" + String.valueOf(expression) + "\' (class " + (expression.getClass()).getName() + ") is not supported";
}

private static final Package javaLangPackage = Package.getPackage("java.lang");
Expand Down
32 changes: 0 additions & 32 deletions pmml-sparkml/src/main/java/org/jpmml/sparkml/ExpressionUtil.java
View file

This file was deleted.

3 changes: 1 addition & 2 deletions pmml-sparkml/src/main/java/org/jpmml/sparkml/feature/SQLTransformerConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.jpmml.sparkml.AliasExpression;
import org.jpmml.sparkml.DatasetUtil;
import org.jpmml.sparkml.ExpressionTranslator;
import org.jpmml.sparkml.ExpressionUtil;
import org.jpmml.sparkml.FeatureConverter;
import org.jpmml.sparkml.SparkMLEncoder;
import scala.collection.JavaConversions;
Expand Down Expand Up @@ -143,7 +142,7 @@ public List<?> encodeLogicalPlan(SparkMLEncoder encoder, LogicalPlan logicalPlan
} else

{
name = FieldNameUtil.create("sql", ExpressionUtil.format(expression));
name = FieldNameUtil.create("sql", String.valueOf(expression));
}

DataType dataType = DatasetUtil.translateDataType(expression.dataType());
Expand Down

0 comments on commit ef6cf30

Please sign in to comment.