Skip to content
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

Jump to bottom

ESQL: Refactor Join inside the planner #115813

Merged
merged 10 commits into from
Oct 31, 2024
Merged

ESQL: Refactor Join inside the planner #115813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc21eca
ESQL: Refactor Join inside the planner
costin Aug 28, 2024
2f0a3d5
Merge branch 'main' into esql/inlinestats-as-join
costin Oct 30, 2024
038cc81
Another set of fixes
costin Oct 30, 2024
fe0cdeb
Fix typo
costin Oct 30, 2024
894e0f3
disable more tests
costin Oct 30, 2024
86f6cd9
Merge branch 'main' into esql/inlinestats-as-join
costin Oct 30, 2024
1486dff
Address feedback
costin Oct 30, 2024
863b02d
Add dedicated Capability to help with mixed clusters
costin Oct 30, 2024
b0d261a
Update more tests
costin Oct 31, 2024
8ffc167
Update telemetry IT
costin Oct 31, 2024
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
1 change: 1 addition & 0 deletions ...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ protected void shouldSkipTest(String testName) throws IOException {
);
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains("inlinestats"));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains("inlinestats_v2"));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains("join_planning_v1"));
}

private TestFeatureService remoteFeaturesService() throws IOException {
Expand Down
1 change: 1 addition & 0 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 @@ -360,6 +360,7 @@ public void testProfileOrdinalsGroupingOperator() throws IOException {
assertThat(signatures, hasItem(hasItem("OrdinalsGroupingOperator[aggregators=[\"sum of longs\", \"count\"]]")));
}

@AwaitsFix(bugUrl = "disabled until JOIN infrastructrure properly lands")
public void testInlineStatsProfile() throws IOException {
assumeTrue("INLINESTATS only available on snapshots", Build.current().isSnapshot());
indexTimestampData(1);
Expand Down
1 change: 1 addition & 0 deletions ...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ public void testComplexFieldNames() throws IOException {
* query. It's part of the "configuration" of the query.
* </p>
*/
@AwaitsFix(bugUrl = "Disabled temporarily until JOIN implementation is completed")
public void testInlineStatsNow() throws IOException {
assumeTrue("INLINESTATS only available on snapshots", Build.current().isSnapshot());
indexTimestampData(1);
Expand Down
6 changes: 5 additions & 1 deletion ...plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.apache.lucene.document.InetAddressPoint;
import org.apache.lucene.sandbox.document.HalfFloatPoint;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.breaker.CircuitBreaker;
import org.elasticsearch.common.breaker.NoopCircuitBreaker;
import org.elasticsearch.common.bytes.BytesReference;
Expand Down Expand Up @@ -600,7 +601,10 @@ else if (Files.isDirectory(path)) {
Files.walkFileTree(path, EnumSet.allOf(FileVisitOption.class), 1, new SimpleFileVisitor<>() {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
if (Regex.simpleMatch(filePattern, file.toString())) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Fix to make CsvTests work inside the IDE against individual files ("lookup.csv-spec" vs "*.csv-spec)

// remove the path folder from the URL
String name = Strings.replace(file.toUri().toString(), path.toUri().toString(), StringUtils.EMPTY);
Tuple<String, String> entrySplit = pathAndName(name);
if (root.equals(entrySplit.v1()) && Regex.simpleMatch(filePattern, entrySplit.v2())) {
matches.add(file.toUri().toURL());
}
return FileVisitResult.CONTINUE;
Expand Down
Loading