SQL: Fix qualified attribute resolution with CCS #81320
Merged
Conversation
This file contains 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
In case the fields are qualified only by the index name in a cross cluster search query, the field resolution was failing since an attribute's qualification contains the cluster name, while a field's doesn't. This changes the existing `Attribute#qualifiedName()` to return a qualification including the index name only and adds (for completion) a new method, `fullyQualifiedName()`, which will return the 'cluster:index' qualification. This will allow queries like this to work: `SELECT remote_index.field FROM remote_cluster:remote_index` or `SELECT remote_index.field FROM remote_index` when the cluster is provided through the xDBC "cluster" parameter.
|
Pinging @elastic/es-ql (Team:QL) |
costin
approved these changes
Dec 6, 2021
Comment on lines
17
to
18
| import static org.elasticsearch.transport.RemoteClusterAware.buildRemoteIndexName; | ||
| import static org.elasticsearch.xpack.ql.util.RemoteClusterUtils.splitQualifiedIndex; |
There was a problem hiding this comment.
Let's wrap this functionality (which is just string manipulation) inside StringUtils inside ql - those methods can call just delegate behind the scenes.
RemoteClusterUtils might be be folded into that if possible.
The upside is we don't depend directly on transport or remote write but rather it's just a StringUtils.splitCatalog or something similar.
| @@ -62,6 +74,10 @@ public String qualifiedName() { | |||
| return qualifier == null ? name() : qualifier + "." + name(); | |||
| } | |||
|
|
|||
| public String fullyQualifiedName() { | |||
There was a problem hiding this comment.
Who uses fully qualified name? If there's nobody I would remove it.
If it has to stay, I recommend rename it something like catalogQualifiedName() - fully doesn't convey much.
- remove currently unused method; - move RemoteClusterUtils methods into StringUtils.
|
@elasticmachine run elasticsearch-ci/part-2 |
bpintea
added
the
auto-backport
|
@elasticmachine update branch |
💚 Backport successful
|
bpintea
added a commit
to bpintea/elasticsearch
that referenced
this pull request
Dec 9, 2021
In case the fields are qualified only by the index name in a cross cluster search query, the field resolution was failing since an attribute's qualification contains the cluster name, while a field's doesn't. This changes the existing `Attribute#qualifiedName()` to return a qualification including the index name only and adds (for completion) a new method, `fullyQualifiedName()`, which will return the 'cluster:index' qualification. This will allow queries like this to work: `SELECT remote_index.field FROM remote_cluster:remote_index` or `SELECT remote_index.field FROM remote_index` when the cluster is provided through the xDBC "cluster" parameter.
bpintea
added a commit
that referenced
this pull request
Dec 9, 2021
In case the fields are qualified only by the index name in a cross cluster search query, the field resolution was failing since an attribute's qualification contains the cluster name, while a field's doesn't. This changes the existing `Attribute#qualifiedName()` to return a qualification including the index name only and adds (for completion) a new method, `fullyQualifiedName()`, which will return the 'cluster:index' qualification. This will allow queries like this to work: `SELECT remote_index.field FROM remote_cluster:remote_index` or `SELECT remote_index.field FROM remote_index` when the cluster is provided through the xDBC "cluster" parameter.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In case the fields are qualified only by the index name in a
CCS SQL query, the field resolution was failing since an
attribute's qualification contains the cluster name, while a field's doesn't.
This changes the existing
Attribute#qualifiedName()to return a qualificationincluding the index name only and adds (for completion) a new method,
fullyQualifiedName(), which will return the 'cluster:index' qualification.This will allow queries like this to work:
SELECT remote_index.field FROM remote_cluster:remote_indexor
SELECT remote_index.field FROM remote_indexwhen the cluster is providedthrough the xDBC "cluster" parameter.