Skip to content

Commit 6bb394d

Browse files
Address more code review comments
1 parent d8076d2 commit 6bb394d

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

test/external-modules/esql-heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/heap_attack/HeapAttackIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,6 @@ public void testLookupExplosionManyMatches() throws IOException {
776776
}
777777

778778
public void testLookupExplosionManyMatchesExpression() throws IOException {
779-
// 1500, 10000 is enough locally, but some CI machines need more.
780779
int lookupEntries = 10000;
781780
assertCircuitBreaks(attempt -> lookupExplosion(attempt * 1500, lookupEntries, 1, lookupEntries, true));
782781
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public void writeTo(StreamOutput out) throws IOException {
337337
planOut.writeOptionalNamedWriteable(joinOnConditions);
338338
} else {
339339
if (joinOnConditions != null) {
340-
throw new EsqlIllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
340+
throw new IllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
341341
}
342342
}
343343
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/join/JoinConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.common.io.stream.StreamOutput;
1313
import org.elasticsearch.common.io.stream.Writeable;
1414
import org.elasticsearch.core.Nullable;
15-
import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
1615
import org.elasticsearch.xpack.esql.core.capabilities.Resolvables;
1716
import org.elasticsearch.xpack.esql.core.expression.Attribute;
1817
import org.elasticsearch.xpack.esql.core.expression.Expression;
@@ -61,7 +60,7 @@ public void writeTo(StreamOutput out) throws IOException {
6160
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_ON_EXPRESSION)) {
6261
out.writeOptionalNamedWriteable(joinOnConditions);
6362
} else if (joinOnConditions != null) {
64-
throw new EsqlIllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
63+
throw new IllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
6564
}
6665
}
6766

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/LookupJoinExec.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1212
import org.elasticsearch.common.io.stream.StreamInput;
1313
import org.elasticsearch.common.io.stream.StreamOutput;
14-
import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
1514
import org.elasticsearch.xpack.esql.core.expression.Attribute;
1615
import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
1716
import org.elasticsearch.xpack.esql.core.expression.Expression;
@@ -80,7 +79,7 @@ public void writeTo(StreamOutput out) throws IOException {
8079
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_ON_EXPRESSION)) {
8180
out.writeOptionalNamedWriteable(joinOnConditions);
8281
} else if (joinOnConditions != null) {
83-
throw new EsqlIllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
82+
throw new IllegalArgumentException("LOOKUP JOIN with ON conditions is not supported on remote node");
8483
}
8584
}
8685

0 commit comments

Comments
 (0)