-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Esql - Add planner information to the profile #124919
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.
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
Draft
not-napoleon
wants to merge
26
commits into
elastic:main
Choose a base branch
from
not-napoleon:esql-planner-profile
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
19b95b4
top level plumbing; work in progress
not-napoleon 1e795fc
collected profiles object. WIP, this still doesn't compile
not-napoleon fa82be2
make collected profiles writable. Still WIP
not-napoleon 838cf28
clean up a few more usages
not-napoleon bd1567c
Everything Compiles!
not-napoleon 873f2d7
[CI] Auto commit changes from spotless
9a09236
Profile serialization
not-napoleon df7f07d
Merge remote-tracking branch 'refs/remotes/not-napoleon/esql-planner-…
not-napoleon f28aa9e
Just use Profie instead of creating a new class
not-napoleon 704d51a
Use profile instead of explicit lists
not-napoleon ac2efcd
Merge branch 'main' into esql-planner-profile
not-napoleon c7b782d
fix tests
not-napoleon 73ddcb7
[CI] Auto commit changes from spotless
62da773
plumb planner profile through to the rule runner
not-napoleon 9c1536c
Merge remote-tracking branch 'refs/remotes/not-napoleon/esql-planner-…
not-napoleon 41ac4d4
push the profile one layer deeper into the runner
not-napoleon 9bc9550
add new parameters everywhere
not-napoleon 0530d40
[CI] Auto commit changes from spotless
aa6b085
rule layout draft
not-napoleon a8ad96d
Merge branch 'main' into esql-planner-profile
not-napoleon 845c431
Merge remote-tracking branch 'refs/remotes/not-napoleon/esql-planner-…
not-napoleon 6658b96
[CI] Auto commit changes from spotless
b9c07ee
fix some merge errors
not-napoleon 229c11d
lay out data structures for profile
not-napoleon 6987ac0
Merge remote-tracking branch 'refs/remotes/not-napoleon/esql-planner-…
not-napoleon 5dd319d
[CI] Auto commit changes from spotless
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerProfile.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
package org.elasticsearch.xpack.esql.planner; | ||
|
||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
import org.elasticsearch.common.io.stream.Writeable; | ||
import org.elasticsearch.common.xcontent.ChunkedToXContentObject; | ||
import org.elasticsearch.xcontent.ToXContent; | ||
|
||
import java.io.IOException; | ||
import java.util.ArrayList; | ||
import java.util.HashMap; | ||
import java.util.Iterator; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* Stores profiling information about the query plan. This can be the top level planning on the coordinating node, or the local | ||
* planning on the data nodes. | ||
*/ | ||
public class PlannerProfile implements Writeable, ChunkedToXContentObject { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It looks like this is still work in progress, but I would suggest we try to design it to be a record from the very beginning |
||
|
||
public static final class RuleProfile implements Writeable, ChunkedToXContentObject { | ||
private final List<Long> runDurations; | ||
private int runsWithChanges; | ||
|
||
public RuleProfile() { | ||
this.runDurations = new ArrayList<>(); | ||
this.runsWithChanges = 0; | ||
} | ||
|
||
public RuleProfile(List<Long> durationNanos, int runsWithChanges) { | ||
this.runDurations = durationNanos; | ||
this.runsWithChanges = runsWithChanges; | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
out.writeCollection(runDurations, StreamOutput::writeLong); | ||
out.writeInt(runsWithChanges); | ||
} | ||
|
||
public RuleProfile readFrom(StreamInput in) throws IOException { | ||
List<Long> runDurations = in.readCollectionAsImmutableList(StreamInput::readLong); | ||
int runsWithChanges = in.readInt(); | ||
return new RuleProfile(runDurations, runsWithChanges); | ||
} | ||
|
||
public void addRun(long runDuration, boolean hasChanges) { | ||
runDurations.add(runDuration); | ||
if (hasChanges) { | ||
runsWithChanges++; | ||
} | ||
} | ||
|
||
@Override | ||
public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params) { | ||
// NOCOMMIT | ||
return null; | ||
} | ||
|
||
// NOCOMMIT equals and hashcode, once the fields are stable | ||
} | ||
|
||
public static final PlannerProfile EMPTY = new PlannerProfile(false, ""); | ||
|
||
private final boolean isLocalPlanning; | ||
private final String nodeName; | ||
|
||
private Map<String, Map<String, RuleProfile>> ruleProfiles; | ||
|
||
public PlannerProfile(boolean isLocalPlanning, String nodeName) { | ||
this.isLocalPlanning = isLocalPlanning; | ||
this.nodeName = nodeName; | ||
ruleProfiles = new HashMap<>(); | ||
} | ||
|
||
public static PlannerProfile readFrom(StreamInput in) throws IOException { | ||
// NOCOMMIT - need to read back the profiles | ||
return new PlannerProfile(in.readBoolean(), in.readString()); | ||
} | ||
|
||
public void recordRuleProfile(String batchName, String ruleName, long runDuration, boolean hasChanges) { | ||
ruleProfiles.computeIfAbsent(batchName, k -> new HashMap<>()) | ||
.computeIfAbsent(ruleName, k -> new RuleProfile()) | ||
.addRun(runDuration, hasChanges); | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
out.writeBoolean(isLocalPlanning); | ||
out.writeString(nodeName); | ||
// NOCOMMIT - need to write out the profile map | ||
} | ||
|
||
@Override | ||
public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params) { | ||
// NOCOMMIT | ||
throw new UnsupportedOperationException(); | ||
} | ||
// NOCOMMIT equals and hashcode, once the fields are stable | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: I wonder if we could make this a record?
This way we could avoid custom equals/hashCode/toString.
Merge could be updated to return a new instance instead of mutating this one