[KYUUBI #4218] Prefer to use TableCatalog to load tables from session catalog #4219
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
4 tasks
pan3793
reviewed
Feb 1, 2023
| @@ -141,7 +141,7 @@ class CatalogShim_v2_4 extends SparkCatalogShim { | |||
| catalog.getTablesByName(identifiers).flatMap { t => | |||
| val tableSchema = | |||
| if (t.provider.getOrElse("").equalsIgnoreCase("delta")) { | |||
| spark.table(t.identifier.table).schema | |||
| spark.table(f"${db}.${t.identifier.table}").schema | |||
There was a problem hiding this comment.
can we use t.identifier.toString here?
|
Thanks for investigating and making this PR, could you please verify the case when the db or table name contains dots? |
|
After second thought, I think we can totally remove the current workaround(revert #1476), and just invert the pattern match branch order in - catalog match {
- case builtin if builtin.name() == SESSION_CATALOG =>
- super.getColumnsByCatalog(...)
- case tc: TableCatalog =>
- ...
- }
+ catalog match {
+ case tc: TableCatalog =>
+ ...
+ case builtin if builtin.name() == SESSION_CATALOG =>
+ super.getColumnsByCatalog(...)
+ }Would you please try this way? @nousot-cloud-guy |
Codecov Report
@@ Coverage Diff @@
## master #4219 +/- ##
============================================
+ Coverage 53.07% 53.51% +0.43%
Complexity 13 13
============================================
Files 548 560 +12
Lines 30010 30410 +400
Branches 4035 4082 +47
============================================
+ Hits 15929 16274 +345
- Misses 12599 12634 +35
- Partials 1482 1502 +20
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
pan3793
reviewed
Feb 3, 2023
| @@ -141,7 +141,7 @@ class CatalogShim_v2_4 extends SparkCatalogShim { | |||
| catalog.getTablesByName(identifiers).flatMap { t => | |||
| val tableSchema = | |||
| if (t.provider.getOrElse("").equalsIgnoreCase("delta")) { | |||
| spark.table(t.identifier.table).schema | |||
| spark.table(f"${db}.${t.identifier.table}").schema | |||
There was a problem hiding this comment.
Suggested change
| spark.table(f"${db}.${t.identifier.table}").schema | |
| spark.table(t.identifier.toString).schema |
|
That seems to be working. I've updated the PR with the reverts and new commit. |
pan3793
approved these changes
Feb 6, 2023
pan3793
pushed a commit
that referenced
this pull request
Feb 6, 2023
### _Why are the changes needed?_ To close #4218 . This change ensures BI tools can list columns on Delta Lake tables in all schemas. <img width="312" alt="image" src="https://user-images.githubusercontent.com/89149767/215793967-722eb5f9-ffe4-4ffb-b7f9-1ded06c146d7.png"> <img width="725" alt="image" src="https://user-images.githubusercontent.com/89149767/215794036-871f005f-1494-487d-90aa-1f99891177c2.png"> ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [x] Add screenshots for manual tests if appropriate - [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4219 from nousot-cloud-guy/feature/delta-db-schema. Closes #4218 5698432 [Alex Wiss-Wolferding] Reversing match order in getColumnsByCatalog. a6d973a [Alex Wiss-Wolferding] Revert "[KYUUBI #1458] Delta lake table columns won't show up in DBeaver." 20337dc [Alex Wiss-Wolferding] Revert "Using DB and table name when checking Delta table schema." f7e4675 [Alex Wiss-Wolferding] Using DB and table name when checking Delta table schema. Authored-by: Alex Wiss-Wolferding <alex@nousot.com> Signed-off-by: Cheng Pan <chengpan@apache.org> (cherry picked from commit 2b958c6) Signed-off-by: Cheng Pan <chengpan@apache.org>
|
Merged to master/1.6, thanks @nousot-cloud-guy |
pan3793
changed the title
3 tasks
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.
Why are the changes needed?
To close #4218 .
This change ensures BI tools can list columns on Delta Lake tables in all schemas.
How was this patch tested?
Add some test cases that check the changes thoroughly including negative and positive cases if possible
Add screenshots for manual tests if appropriate
Run test locally before make a pull request