Skip to content

ESQL: Disable format checks on generated imports #127648

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 4 commits into from
May 5, 2025
Merged

ESQL: Disable format checks on generated imports #127648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba49b86
ESQL: Disable format checks on generated imports
nik9000 May 2, 2025
8f7778e
Merge branch 'main' into esql_disable_import_on_gen
nik9000 May 2, 2025
93aa374
Merge branch 'main' into esql_disable_import_on_gen
nik9000 May 5, 2025
0a26851
Merge remote-tracking branch 'nik9000/esql_disable_import_on_gen' int…
nik9000 May 5, 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
5 changes: 5 additions & 0 deletions build-tools-internal/src/main/resources/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@

<!-- Unused imports are forbidden -->
<module name="UnusedImports" />
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="begin generated imports"/>
<property name="onCommentFormat" value="end generated imports"/>
<property name="checkFormat" value="UnusedImports"/>
</module>

<!-- Non-inner classes must be in files that match their names. -->
<module name="OuterTypeFilename" />
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugin/esql/compute/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spotless {
/*
* Generated files go here.
*/
toggleOffOn('begin generated imports', 'end generated imports')
targetExclude "src/main/generated/**/*.java"
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .../esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FloatArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongArrayVector.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions ...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-ArrayVector.java.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

package org.elasticsearch.compute.data;

$if(BytesRef)$
// begin generated imports
Copy link
Contributor

@craigtaverner craigtaverner May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we could apply this simplification to quite a few other *.st files too?

Copy link
Member Author

@nik9000 nik9000 May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Let's get this in an do the others.

import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.io.stream.StreamInput;
Expand All @@ -17,19 +17,10 @@ import org.elasticsearch.common.util.BytesRefArray;
import org.elasticsearch.core.ReleasableIterator;
import org.elasticsearch.core.Releasables;

import java.io.IOException;

$else$
import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.core.ReleasableIterator;

import java.io.IOException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
$endif$
// end generated imports

/**
* Vector implementation that stores an array of $type$ values.
Expand Down