Skip to content

Commit e1eeacd

Browse files
Clean up
1 parent 2263ece commit e1eeacd

File tree

4 files changed

+2
-8
lines changed
  • x-pack/plugin
    • esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex
    • esql
      • qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node
      • src
        • main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/regex
        • test/java/org/elasticsearch/xpack/esql

4 files changed

+2
-8
lines changed

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/RLikePatternList.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class RLikePatternList extends AbstractStringPattern implements Writeable
2222
private final List<RLikePattern> patternList;
2323

2424
public RLikePatternList(List<RLikePattern> patternList) {
25-
2625
this.patternList = patternList;
2726
}
2827

@@ -69,11 +68,9 @@ public boolean equals(Object obj) {
6968
if (this == obj) {
7069
return true;
7170
}
72-
7371
if (obj == null || getClass() != obj.getClass()) {
7472
return false;
7573
}
76-
7774
RLikePatternList other = (RLikePatternList) obj;
7875
return patternList.equals(other.patternList);
7976
}

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public void testRLikeList() throws IOException {
302302
String luceneQuery = switch (type) {
303303
case CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, AUTO, TEXT_WITH_KEYWORD -> "*:*";
304304
case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]";
305-
case KEYWORD -> "test:AutomatonQuery";
305+
case KEYWORD -> "test:RLIKE(\"%value.*\", \"abc*\"), caseInsensitive=false";
306306
};
307307
ComputeSignature dataNodeSignature = switch (type) {
308308
case CONSTANT_KEYWORD, KEYWORD -> ComputeSignature.FILTER_IN_QUERY;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/regex/RLikeList.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class RLikeList extends RegexMatch<RLikePatternList> {
3434
);
3535

3636
/**
37-
* The documentation for this function is in RLike, and shown to the users `RLIKE` in the docs.
37+
* The documentation for this function is in RLike, and shown to the users as `RLIKE` in the docs.
3838
*/
3939
public RLikeList(
4040
Source source,
@@ -85,14 +85,12 @@ public Translatable translatable(LucenePushdownPredicates pushdownPredicates) {
8585
return pushdownPredicates.isPushableAttribute(field()) ? Translatable.YES : Translatable.NO;
8686
}
8787

88-
8988
/**
9089
* Returns a {@link Query} that matches the field against the provided patterns.
9190
* For now, we only support a single pattern in the list for pushdown.
9291
*/
9392
@Override
9493
public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler) {
95-
//throw new RuntimeException("As query called");
9694
var field = field();
9795
LucenePushdownPredicates.checkIsPushableAttribute(field);
9896
return translateField(handler.nameOf(field instanceof FieldAttribute fa ? fa.exactAttribute() : field));

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.elasticsearch.tasks.CancellableTask;
4141
import org.elasticsearch.tasks.TaskId;
4242
import org.elasticsearch.test.ESTestCase;
43-
import org.elasticsearch.test.junit.annotations.TestLogging;
4443
import org.elasticsearch.threadpool.FixedExecutorBuilder;
4544
import org.elasticsearch.threadpool.TestThreadPool;
4645
import org.elasticsearch.threadpool.ThreadPool;

0 commit comments

Comments
 (0)