Skip to content

Commit 6380e03

Browse files
RyanL1997RyanL1997
committed
fix spotless check
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent f8958de commit 6380e03

8 files changed

Lines changed: 36 additions & 37 deletions

File tree

‎core/src/main/java/org/opensearch/sql/analysis/Analyzer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
import org.opensearch.sql.ast.tree.RareTopN;
8181
import org.opensearch.sql.ast.tree.Relation;
8282
import org.opensearch.sql.ast.tree.RelationSubquery;
83-
import org.opensearch.sql.ast.tree.Rex;
8483
import org.opensearch.sql.ast.tree.Rename;
8584
import org.opensearch.sql.ast.tree.Reverse;
85+
import org.opensearch.sql.ast.tree.Rex;
8686
import org.opensearch.sql.ast.tree.Sort;
8787
import org.opensearch.sql.ast.tree.Sort.SortOption;
8888
import org.opensearch.sql.ast.tree.SubqueryAlias;

‎core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
import org.opensearch.sql.ast.tree.Project;
6868
import org.opensearch.sql.ast.tree.RareTopN;
6969
import org.opensearch.sql.ast.tree.Relation;
70-
import org.opensearch.sql.ast.tree.Rex;
7170
import org.opensearch.sql.ast.tree.RelationSubquery;
7271
import org.opensearch.sql.ast.tree.Rename;
7372
import org.opensearch.sql.ast.tree.Reverse;
73+
import org.opensearch.sql.ast.tree.Rex;
7474
import org.opensearch.sql.ast.tree.Sort;
7575
import org.opensearch.sql.ast.tree.SubqueryAlias;
7676
import org.opensearch.sql.ast.tree.TableFunction;
@@ -253,6 +253,7 @@ public T visitReverse(Reverse node, C context) {
253253
public T visitRex(Rex node, C context) {
254254
return visitChildren(node, context);
255255
}
256+
256257
public T visitLambdaFunction(LambdaFunction node, C context) {
257258
return visitChildren(node, context);
258259
}

‎core/src/main/java/org/opensearch/sql/ast/tree/Rex.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ public List<UnresolvedPlan> getChild() {
5858
public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
5959
return nodeVisitor.visitRex(this, context);
6060
}
61-
}
61+
}

‎core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@
118118
import org.opensearch.sql.common.utils.StringUtils;
119119
import org.opensearch.sql.exception.CalciteUnsupportedException;
120120
import org.opensearch.sql.exception.SemanticCheckException;
121-
import org.opensearch.sql.expression.parse.RegexExpression;
122121
import org.opensearch.sql.expression.function.BuiltinFunctionName;
123122
import org.opensearch.sql.expression.function.PPLFuncImpTable;
123+
import org.opensearch.sql.expression.parse.RegexExpression;
124124
import org.opensearch.sql.utils.ParseUtils;
125125

126126
public class CalciteRelNodeVisitor extends AbstractNodeVisitor<RelNode, CalcitePlanContext> {
@@ -180,34 +180,37 @@ public RelNode visitRex(Rex node, CalcitePlanContext context) {
180180
RexNode fieldRex = rexVisitor.analyze(node.getField(), context);
181181
String patternStr = (String) node.getPattern().getValue();
182182
List<String> namedGroups = RegexExpression.getNamedGroupCandidates(patternStr);
183-
183+
184184
if (namedGroups.isEmpty()) {
185-
throw new IllegalArgumentException("Rex pattern must contain at least one named capture group");
185+
throw new IllegalArgumentException(
186+
"Rex pattern must contain at least one named capture group");
186187
}
187188

188189
// Filter matching rows on data nodes using script pushdown
189-
RexNode regexMatchCondition = context.rexBuilder.makeCall(
190-
org.apache.calcite.sql.fun.SqlLibraryOperators.REGEXP_CONTAINS,
191-
fieldRex,
192-
context.rexBuilder.makeLiteral(patternStr)
193-
);
190+
RexNode regexMatchCondition =
191+
context.rexBuilder.makeCall(
192+
org.apache.calcite.sql.fun.SqlLibraryOperators.REGEXP_CONTAINS,
193+
fieldRex,
194+
context.rexBuilder.makeLiteral(patternStr));
194195
context.relBuilder.filter(regexMatchCondition);
195196

196197
// Extract fields from filtered data
197198
List<RexNode> newFields = new ArrayList<>();
198199
for (int i = 0; i < namedGroups.size(); i++) {
199-
RexNode extractCall = PPLFuncImpTable.INSTANCE.resolve(
200-
context.rexBuilder,
201-
BuiltinFunctionName.REX_EXTRACT,
202-
fieldRex,
203-
context.rexBuilder.makeLiteral(patternStr),
204-
context.relBuilder.literal(i + 1));
200+
RexNode extractCall =
201+
PPLFuncImpTable.INSTANCE.resolve(
202+
context.rexBuilder,
203+
BuiltinFunctionName.REX_EXTRACT,
204+
fieldRex,
205+
context.rexBuilder.makeLiteral(patternStr),
206+
context.relBuilder.literal(i + 1));
205207
newFields.add(extractCall);
206208
}
207209

208210
projectPlusOverriding(newFields, namedGroups, context);
209211
return context.relBuilder.peek();
210212
}
213+
211214
private boolean containsSubqueryExpression(Node expr) {
212215
if (expr == null) {
213216
return false;

‎core/src/main/java/org/opensearch/sql/calcite/utils/PPLOperandTypes.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ private PPLOperandTypes() {}
4848
public static final UDFOperandMetadata STRING_INTEGER =
4949
UDFOperandMetadata.wrap(OperandTypes.family(SqlTypeFamily.CHARACTER, SqlTypeFamily.INTEGER));
5050
public static final UDFOperandMetadata STRING_STRING_INTEGER =
51-
UDFOperandMetadata.wrap(OperandTypes.family(SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER, SqlTypeFamily.INTEGER));
51+
UDFOperandMetadata.wrap(
52+
OperandTypes.family(
53+
SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER, SqlTypeFamily.INTEGER));
5254

5355
public static final UDFOperandMetadata NUMERIC_NUMERIC_NUMERIC =
5456
UDFOperandMetadata.wrap(

‎core/src/main/java/org/opensearch/sql/expression/function/PPLFuncImpTable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160
import static org.opensearch.sql.expression.function.BuiltinFunctionName.RAND;
161161
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REDUCE;
162162
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REGEXP;
163-
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REX_EXTRACT;
164163
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REPLACE;
165164
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REVERSE;
165+
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REX_EXTRACT;
166166
import static org.opensearch.sql.expression.function.BuiltinFunctionName.RIGHT;
167167
import static org.opensearch.sql.expression.function.BuiltinFunctionName.RINT;
168168
import static org.opensearch.sql.expression.function.BuiltinFunctionName.ROUND;

‎core/src/main/java/org/opensearch/sql/expression/function/udf/RexExtractFunction.java‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.expression.function.udf;
77

8+
import java.util.List;
89
import org.apache.calcite.adapter.enumerable.NotNullImplementor;
910
import org.apache.calcite.adapter.enumerable.NullPolicy;
1011
import org.apache.calcite.adapter.enumerable.RexToLixTranslator;
@@ -17,11 +18,7 @@
1718
import org.opensearch.sql.expression.function.ImplementorUDF;
1819
import org.opensearch.sql.expression.function.UDFOperandMetadata;
1920

20-
import java.util.List;
21-
22-
/**
23-
* Custom REX_EXTRACT function for extracting regex named capture groups.
24-
*/
21+
/** Custom REX_EXTRACT function for extracting regex named capture groups. */
2522
public final class RexExtractFunction extends ImplementorUDF {
2623

2724
public RexExtractFunction() {
@@ -46,32 +43,27 @@ public Expression implement(
4643
Expression field = translatedOperands.get(0);
4744
Expression pattern = translatedOperands.get(1);
4845
Expression groupIndex = translatedOperands.get(2);
49-
50-
return Expressions.call(
51-
RexExtractFunction.class,
52-
"extractGroup",
53-
field,
54-
pattern,
55-
groupIndex
56-
);
46+
47+
return Expressions.call(RexExtractFunction.class, "extractGroup", field, pattern, groupIndex);
5748
}
5849
}
50+
5951
public static String extractGroup(String text, String pattern, int groupIndex) {
6052
if (text == null || pattern == null) {
6153
return null;
6254
}
63-
55+
6456
try {
6557
java.util.regex.Pattern compiledPattern = java.util.regex.Pattern.compile(pattern);
6658
java.util.regex.Matcher matcher = compiledPattern.matcher(text);
67-
59+
6860
if (matcher.find() && groupIndex > 0 && groupIndex <= matcher.groupCount()) {
6961
return matcher.group(groupIndex);
7062
}
71-
63+
7264
return null;
7365
} catch (Exception e) {
7466
return null;
7567
}
7668
}
77-
}
69+
}

‎ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
import org.opensearch.sql.ast.tree.RareTopN.CommandType;
8080
import org.opensearch.sql.ast.tree.Relation;
8181
import org.opensearch.sql.ast.tree.Rename;
82-
import org.opensearch.sql.ast.tree.Rex;
8382
import org.opensearch.sql.ast.tree.Reverse;
83+
import org.opensearch.sql.ast.tree.Rex;
8484
import org.opensearch.sql.ast.tree.Sort;
8585
import org.opensearch.sql.ast.tree.SubqueryAlias;
8686
import org.opensearch.sql.ast.tree.TableFunction;
@@ -780,6 +780,7 @@ public UnresolvedPlan visitRexCommand(OpenSearchPPLParser.RexCommandContext ctx)
780780

781781
return new Rex(field, pattern, maxMatch);
782782
}
783+
783784
/** Get original text in query. */
784785
private String getTextInQuery(ParserRuleContext ctx) {
785786
Token start = ctx.getStart();

0 commit comments

Comments
 (0)