Skip to content

Commit

Permalink
Merge branch 'integ/sl_GoogleJavaFormat1' into dev/sl_GoogleJavaFormat1
Browse files Browse the repository at this point in the history
  • Loading branch information
@MitchellGale
MitchellGale authored Jul 31, 2023
2 parents 606b863 + ae45ff1 commit bb14f18
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 43 deletions.
68 changes: 33 additions & 35 deletions core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/


package org.opensearch.sql.ast.dsl;

import java.util.Arrays;
Expand Down Expand Up @@ -63,9 +62,7 @@
import org.opensearch.sql.ast.tree.UnresolvedPlan;
import org.opensearch.sql.ast.tree.Values;

/**
* Class of static methods to create specific node instances.
*/
/** Class of static methods to create specific node instances. */
@UtilityClass
public class AstDSL {

Expand Down Expand Up @@ -132,8 +129,9 @@ public static UnresolvedPlan rename(UnresolvedPlan input, Map... maps) {

/**
* Initialize Values node by rows of literals.
* @param values rows in which each row is a list of literal values
* @return Values node
*
* @param values rows in which each row is a list of literal values
* @return Values node
*/
@SafeVarargs
public UnresolvedPlan values(List<Literal>... values) {
Expand Down Expand Up @@ -255,8 +253,7 @@ public static Function function(String funcName, UnresolvedExpression... funcArg
* &emsp; [ELSE result_expr]<br>
* END
*/
public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
When... whenClauses) {
public UnresolvedExpression caseWhen(UnresolvedExpression elseClause, When... whenClauses) {
return caseWhen(null, elseClause, whenClauses);
}

Expand All @@ -267,9 +264,8 @@ public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
* &emsp; [ELSE result_expr]<br>
* END
*/
public UnresolvedExpression caseWhen(UnresolvedExpression caseValueExpr,
UnresolvedExpression elseClause,
When... whenClauses) {
public UnresolvedExpression caseWhen(
UnresolvedExpression caseValueExpr, UnresolvedExpression elseClause, When... whenClauses) {
return new Case(caseValueExpr, Arrays.asList(whenClauses), elseClause);
}

Expand All @@ -281,19 +277,20 @@ public When when(UnresolvedExpression condition, UnresolvedExpression result) {
return new When(condition, result);
}

public UnresolvedExpression highlight(UnresolvedExpression fieldName,
java.util.Map<String, Literal> arguments) {
public UnresolvedExpression highlight(
UnresolvedExpression fieldName, java.util.Map<String, Literal> arguments) {
return new HighlightFunction(fieldName, arguments);
}

public UnresolvedExpression score(UnresolvedExpression relevanceQuery,
Literal relevanceFieldWeight) {
public UnresolvedExpression score(
UnresolvedExpression relevanceQuery, Literal relevanceFieldWeight) {
return new ScoreFunction(relevanceQuery, relevanceFieldWeight);
}

public UnresolvedExpression window(UnresolvedExpression function,
List<UnresolvedExpression> partitionByList,
List<Pair<SortOption, UnresolvedExpression>> sortList) {
public UnresolvedExpression window(
UnresolvedExpression function,
List<UnresolvedExpression> partitionByList,
List<Pair<SortOption, UnresolvedExpression>> sortList) {
return new WindowFunction(function, partitionByList, sortList);
}

Expand Down Expand Up @@ -328,9 +325,10 @@ public static UnresolvedExpression compare(
return new Compare(operator, left, right);
}

public static UnresolvedExpression between(UnresolvedExpression value,
UnresolvedExpression lowerBound,
UnresolvedExpression upperBound) {
public static UnresolvedExpression between(
UnresolvedExpression value,
UnresolvedExpression lowerBound,
UnresolvedExpression upperBound) {
return new Between(value, lowerBound, upperBound);
}

Expand Down Expand Up @@ -398,9 +396,7 @@ public static List<Argument> defaultFieldsArgs() {
return exprList(argument("exclude", booleanLiteral(false)));
}

/**
* Default Stats Command Args.
*/
/** Default Stats Command Args. */
public static List<Argument> defaultStatsArgs() {
return exprList(
argument("partitions", intLiteral(1)),
Expand All @@ -409,9 +405,7 @@ public static List<Argument> defaultStatsArgs() {
argument("dedupsplit", booleanLiteral(false)));
}

/**
* Default Dedup Command Args.
*/
/** Default Dedup Command Args. */
public static List<Argument> defaultDedupArgs() {
return exprList(
argument("number", intLiteral(1)),
Expand Down Expand Up @@ -447,9 +441,12 @@ public static List<Argument> defaultTopArgs() {
return exprList(argument("noOfResults", intLiteral(10)));
}

public static RareTopN rareTopN(UnresolvedPlan input, CommandType commandType,
List<Argument> noOfResults, List<UnresolvedExpression> groupList,
Field... fields) {
public static RareTopN rareTopN(
UnresolvedPlan input,
CommandType commandType,
List<Argument> noOfResults,
List<UnresolvedExpression> groupList,
Field... fields) {
return new RareTopN(input, commandType, noOfResults, Arrays.asList(fields), groupList)
.attach(input);
}
Expand All @@ -458,11 +455,12 @@ public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
return new Limit(limit, offset).attach(input);
}

public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
UnresolvedExpression sourceField,
Literal pattern,
java.util.Map<String, Literal> arguments) {
public static Parse parse(
UnresolvedPlan input,
ParseMethod parseMethod,
UnresolvedExpression sourceField,
Literal pattern,
java.util.Map<String, Literal> arguments) {
return new Parse(parseMethod, sourceField, pattern, arguments, input);
}

}
15 changes: 7 additions & 8 deletions core/src/main/java/org/opensearch/sql/data/type/WideningTypeRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/


package org.opensearch.sql.data.type;

import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
Expand Down Expand Up @@ -31,8 +30,8 @@ public class WideningTypeRule {
public static final int TYPE_EQUAL = 0;

/**
* The widening distance is calculated from the leaf to root.
* e.g. distance(INTEGER, FLOAT) = 2, but distance(FLOAT, INTEGER) = IMPOSSIBLE_WIDENING
* The widening distance is calculated from the leaf to root. e.g. distance(INTEGER, FLOAT) = 2,
* but distance(FLOAT, INTEGER) = IMPOSSIBLE_WIDENING
*
* @param type1 widen from type
* @param type2 widen to type
Expand All @@ -50,15 +49,15 @@ private static int distance(ExprType type1, ExprType type2, int distance) {
} else {
return type1.getParent().stream()
.map(parentOfType1 -> distance(parentOfType1, type2, distance + 1))
.reduce(Math::min).get();
.reduce(Math::min)
.get();
}
}

/**
* The max type among two types. The max is defined as follow
* if type1 could widen to type2, then max is type2, vice versa
* if type1 could't widen to type2 and type2 could't widen to type1,
* then throw {@link ExpressionEvaluationException}.
* The max type among two types. The max is defined as follow if type1 could widen to type2, then
* max is type2, vice versa if type1 could't widen to type2 and type2 could't widen to type1, then
* throw {@link ExpressionEvaluationException}.
*
* @param type1 type1
* @param type2 type2
Expand Down

0 comments on commit bb14f18

Please sign in to comment.