Skip to content

ESQL: Apply precommit plugins to qa #127580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2025
Merged

ESQL: Apply precommit plugins to qa #127580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c240279
ESQL: Apply precommit plugins to qa
nik9000 Apr 30, 2025
fd83855
Merge branch 'main' into esql_apply_precommit
nik9000 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.bwc-test'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin

restResources {
restApi {
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugin/esql/qa/server/multi-clusters/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.bwc-test'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin

dependencies {
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugin/esql/qa/server/multi-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import org.elasticsearch.gradle.util.GradleUtils
apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin

dependencies {
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugin/esql/qa/server/single-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
// Necessary to use tests in Serverless
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin

dependencies {
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
Expand Down
3 changes: 2 additions & 1 deletion ...node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -164,7 +165,7 @@ private void indexValue(String value) throws IOException {

Request bulk = new Request("POST", "/_bulk");
bulk.addParameter("refresh", "");
bulk.setJsonEntity(String.format("""
bulk.setJsonEntity(String.format(Locale.ROOT, """
{"create":{"_index":"test"}}
{"test":"%s"}
""", value));
Expand Down
20 changes: 11 additions & 9 deletions ...le-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,13 +707,13 @@ public void testSuggestedCast() throws IOException {
"default_metric": "max"
""";
}
createIndex("index-" + type.esType(), null, """
createIndex("index-" + type.esType(), null, String.format(Locale.ROOT, """
"properties": {
"my_field": {
"type": "%s" %s
}
}
""".formatted(type.esType(), additionalProperties));
""", type.esType(), additionalProperties));
Request doc = new Request("PUT", "index-" + type.esType() + "/_doc/1");
doc.setJsonEntity("{\"my_field\": " + typesAndValues.get(type) + "}");
client().performRequest(doc);
Expand All @@ -724,11 +724,11 @@ public void testSuggestedCast() throws IOException {

for (int i = 0; i < listOfTypes.size(); i++) {
for (int j = i + 1; j < listOfTypes.size(); j++) {
String query = """
String query = String.format(Locale.ROOT, """
{
"query": "FROM index-%s,index-%s | LIMIT 100 | KEEP my_field"
}
""".formatted(listOfTypes.get(i).esType(), listOfTypes.get(j).esType());
""", listOfTypes.get(i).esType(), listOfTypes.get(j).esType());
Request request = new Request("POST", "/_query");
request.setJsonEntity(query);
Response resp = client().performRequest(request);
Expand All @@ -749,11 +749,13 @@ public void testSuggestedCast() throws IOException {
)
);

String castedQuery = """
{
"query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s"
}
""".formatted(
String castedQuery = String.format(
Locale.ROOT,
"""
{
"query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s"
}
""",
listOfTypes.get(i).esType(),
listOfTypes.get(j).esType(),
suggestedCast == DataType.KEYWORD ? "STRING" : suggestedCast.nameUpper()
Expand Down
3 changes: 2 additions & 1 deletion ...vaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.runEsql;
import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.commonProfile;
import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.fixTypesOnProfile;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.instanceOf;

/**
* Tests for {@code index.esql.stored_fields_sequential_proportion} which controls
Expand Down