-
Notifications
You must be signed in to change notification settings - Fork 141
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
Catalog to Datasource changes #1086
Catalog to Datasource changes #1086
Conversation
c59e04c
to
5a9b51f
Compare
Codecov Report
@@ Coverage Diff @@
## 2.x #1086 +/- ##
=========================================
Coverage 98.27% 98.27%
Complexity 3434 3434
=========================================
Files 343 343
Lines 8540 8540
Branches 544 544
=========================================
Hits 8393 8393
Misses 142 142
Partials 5 5
Flags with carried forward coverage won't be shown. Click here to find out more. Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
e295d9c
to
ab3ae58
Compare
393e449
to
fefaa1e
Compare
release-notes/opendistro-for-elasticsearch-sql.release-notes-1.9.0.1.md
Outdated
Show resolved
Hide resolved
fefaa1e
to
c2ed816
Compare
plugin/src/main/java/org/opensearch/sql/plugin/datasource/DataSourceSettings.java
Outdated
Show resolved
Hide resolved
LinkedHashMap<String, ExprValue> valueMap = new LinkedHashMap<>(); | ||
valueMap.put("TABLE_CATALOG", stringValue(catalogSchemaName.getCatalogName())); | ||
valueMap.put("TABLE_SCHEMA", stringValue(catalogSchemaName.getSchemaName())); | ||
valueMap.put("TABLE_CATALOG", stringValue(dataSourceSchemaName.getDataSourceName())); |
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.
is this table_catalog notion differs from the datasource ?
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.
both are same.
TABLE_CATALOG is pre-existing response column when we query metadata about opensearch indices.
I am following the same convention right now in order to be consistent with opensearch metadata queries.
Need to re-think if we can remove from both the places.
Will do it in a separate PR because we need to think about backward compatibility of existing queries.
May be we can change TABLE_CATALOG to TABLE_DATASOURCE in prometheus.
Signed-off-by: vamsi-amazon <[email protected]>
c2ed816
to
0ef3c9e
Compare
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.
Thanks.
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.
should logs also be updated?
Prometheus Catalog doesn't multiple aggregations in stats command
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.4 2.4
# Navigate to the new working tree
cd .worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-1086-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fef20f86b3eeffe3f16697e52df7eea3bd31b762
# Push it to GitHub
git push --set-upstream origin backport/backport-1086-to-2.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.4 Then, create a pull request where the |
Signed-off-by: vamsi-amazon [email protected]
Description
This CR changes internal catalog code references to datasource references.
Issues Resolved
#1028
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.