Skip to content

Commit

Permalink
[KYUUBI #6726][FOLLOWUP] Fix compilation on scala-2.13
Browse files Browse the repository at this point in the history
# Description

Currently, Kyuubi supports Trino progress in scala-2.12, but got some error in scala-2.13.
* Make Trino progress available in scala-2.13

## 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 🧪

---

# 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 #6841 from naive-zhang/trino-scala13.

Closes #6726

0693d28 [Cheng Pan] Update externals/kyuubi-trino-engine/pom.xml
c20c49a [native-zhang] modify scala code style
6cfe445 [native-zhang] unify scala grammar
c0cd92e [native-zhang] change total stage num back into 3 in TrinoOperationProgressSuite
852398d [naive-zhang] Merge branch 'apache:master' into trino-scala13
6a038ec [native-zhang] move trino progress monitor available in profile scala-2.13
f434a21 [native-zhang] move trino progress monitor into scala-2.12 impl and change state num in some test case
8d291f5 [native-zhang] add scala version diff in pom for trino module

Lead-authored-by: native-zhang <[email protected]>
Co-authored-by: Cheng Pan <[email protected]>
Co-authored-by: naive-zhang <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
  • Loading branch information
naive-zhang and pan3793 committed Dec 9, 2024
1 parent a2d9e66 commit 62c06ad
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ class TrinoProgressMonitor(trino: StatementClient) {
stage.getFailedTasks)
stages.append((TrinoStage(stageId), stageProgress))
val subStages = asScalaBuffer(stage.getSubStages)
stageQueue.enqueue(subStages: _*)
stageQueue ++= subStages.toSeq
}
SortedMap(stages: _*)
SortedMap(stages.toSeq: _*)
} else {
SortedMap()
}
Expand Down

0 comments on commit 62c06ad

Please sign in to comment.