Skip to content

[KYUUBI #6147][TRINO] Use the overlay conf as session conf #6148

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
Closed
zwangsheng wants to merge 3 commits into from
Closed

[KYUUBI #6147][TRINO] Use the overlay conf as session conf #6148

zwangsheng wants to merge 3 commits into from

Conversation

@zwangsheng
Copy link
Contributor

@zwangsheng zwangsheng commented Mar 8, 2024

🔍 Description

Issue References 🔗

This pull request fixes #6147

Describe Your Solution 🔧

Overwriting the engine conf with the passed conf consider as the full session conf.

Types of changes 🔖

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Test Plan 🧪

Behavior Without This Pull Request ⚰️

Behavior With This Pull Request 🎉

Related Unit Tests

None

Checklist 📝

Be nice. Be informative.

@zwangsheng zwangsheng requested review from cxzl25 and pan3793 March 8, 2024 06:50
cxzl25
cxzl25 reviewed Mar 8, 2024
View reviewed changes
...bi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionImpl.scala Outdated
val sessionConf: KyuubiConf = sessionManager.getConf
val sessionConf: KyuubiConf = {
val engineConf = sessionManager.getConf
conf.foreach(kv => engineConf.set(kv._1, kv._2))
Copy link
Contributor

@cxzl25 cxzl25 Mar 8, 2024

Choose a reason for hiding this comment

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

Will this not pollute the engine conf?

Copy link
Contributor Author

@zwangsheng zwangsheng Mar 8, 2024

Choose a reason for hiding this comment

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

thanks for catch, using sessionManager.getConf.clone instead.

Copy link
Member

@pan3793 pan3793 Mar 8, 2024

Choose a reason for hiding this comment

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

@cxzl25 seems we lack a pre-assembled session conf in AbstractSession, we need some major refactor to simplify the current conf evaluation, I roughly remember you have raised a similar idea previously.

Copy link
Contributor

@cxzl25 cxzl25 Mar 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

#2808

d0f4798

pan3793
pan3793 approved these changes Mar 8, 2024
View reviewed changes
Copy link
Member

@pan3793 pan3793 left a comment

Choose a reason for hiding this comment

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

LGTM, I think we can adopt this ad-hoc fix and reconsider the d0f4798 's idea later

@pan3793 pan3793 changed the title [KYUUBI #6147][TRINO] Using the overlay conf as session conf [KYUUBI #6147][TRINO] Use the overlay conf as session conf Mar 8, 2024
@pan3793
Update externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi…
3e0fb0f 
…/engine/trino/session/TrinoSessionImpl.scala
@codecov-commenter
Copy link

codecov-commenter commented Mar 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.98%. Comparing base (6fc7552) to head (452224e).

❗ Current head 452224e differs from pull request most recent head 3e0fb0f. Consider uploading reports for the commit 3e0fb0f to get more accurate results

Additional details and impacted files 
@@             Coverage Diff              @@
##             master    #6148      +/-   ##
============================================
- Coverage     61.08%   60.98%   -0.11%     
  Complexity       24       24              
============================================
  Files           625      625              
  Lines         37219    37219              
  Branches       5029     5029              
============================================
- Hits          22737    22699      -38     
- Misses        12029    12065      +36     
- Partials       2453     2455       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pan3793 pan3793 closed this in f5b89b0 Mar 8, 2024
pan3793 added a commit that referenced this pull request Mar 8, 2024
@zwangsheng @pan3793
[KYUUBI #6147][TRINO] Use the overlay conf as session conf
0b53703 
# 🔍 Description
## Issue References 🔗

This pull request fixes #6147

## Describe Your Solution 🔧

Overwriting the engine conf with the passed conf consider as the full session conf.

## Types of changes 🔖

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request ⚰️

#### Behavior With This Pull Request 🎉

#### Related Unit Tests
None

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes #6148 from zwangsheng/KYUUBI#6147.

Closes #6147

3e0fb0f [Cheng Pan] Update externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionImpl.scala
452224e [zwangsheng] fix comments
4ee7c04 [zwangsheng] [KYUUBI #6147][TRINO] Using the overlay conf as session conf

Lead-authored-by: zwangsheng <binjieyang@apache.org>
Co-authored-by: Cheng Pan <pan3793@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
(cherry picked from commit f5b89b0)
Signed-off-by: Cheng Pan <chengpan@apache.org>
@pan3793 pan3793 added this to the v1.8.2 milestone Mar 8, 2024
@pan3793
Copy link
Member

pan3793 commented Mar 8, 2024

Thanks, merged to master/1.8.2

@pan3793 pan3793 mentioned this pull request Mar 8, 2024
Closed
4 tasks
zhouyifan279 pushed a commit to zhouyifan279/kyuubi that referenced this pull request Mar 11, 2024
@zwangsheng @pan3793 @zhouyifan279
[KYUUBI apache#6147][TRINO] Use the overlay conf as session conf
7037b72 
# 🔍 Description
## Issue References 🔗

This pull request fixes apache#6147

## Describe Your Solution 🔧

Overwriting the engine conf with the passed conf consider as the full session conf.

## Types of changes 🔖

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request ⚰️

#### Behavior With This Pull Request 🎉

#### Related Unit Tests
None

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes apache#6148 from zwangsheng/KYUUBI#6147.

Closes apache#6147

3e0fb0f [Cheng Pan] Update externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionImpl.scala
452224e [zwangsheng] fix comments
4ee7c04 [zwangsheng] [KYUUBI apache#6147][TRINO] Using the overlay conf as session conf

Lead-authored-by: zwangsheng <binjieyang@apache.org>
Co-authored-by: Cheng Pan <pan3793@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
zhaohehuhu pushed a commit to zhaohehuhu/incubator-kyuubi that referenced this pull request Mar 21, 2024
@zwangsheng @pan3793 @zhaohehuhu
[KYUUBI apache#6147][TRINO] Use the overlay conf as session conf
d02536d 
# 🔍 Description
## Issue References 🔗

This pull request fixes apache#6147

## Describe Your Solution 🔧

Overwriting the engine conf with the passed conf consider as the full session conf.

## Types of changes 🔖

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request ⚰️

#### Behavior With This Pull Request 🎉

#### Related Unit Tests
None

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes apache#6148 from zwangsheng/KYUUBI#6147.

Closes apache#6147

3e0fb0f [Cheng Pan] Update externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionImpl.scala
452224e [zwangsheng] fix comments
4ee7c04 [zwangsheng] [KYUUBI apache#6147][TRINO] Using the overlay conf as session conf

Lead-authored-by: zwangsheng <binjieyang@apache.org>
Co-authored-by: Cheng Pan <pan3793@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cxzl25 cxzl25 cxzl25 left review comments

@pan3793 pan3793 pan3793 approved these changes

Assignees

@zwangsheng zwangsheng

Labels

module:trino

Projects

None yet

Milestone

v1.8.2

Development

Successfully merging this pull request may close these issues.

[Bug][TRINO] Trino engine use the engine level conf as session level conf

4 participants

@zwangsheng @codecov-commenter @pan3793 @cxzl25