Skip to content

1.2.4 #203

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

Merged
merged 24 commits into from
Jul 25, 2023
Merged

1.2.4 #203

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
48defb9
updating version to 1.2.4-SNAPSHOT
Jolanrensen Jan 5, 2023
5100dd5
Update README.md
Jolanrensen Jan 5, 2023
3477b3e
Update quick-start-guide.md
Jolanrensen Jan 5, 2023
ba13a59
Replace type check by pattern match
cutiechi Feb 2, 2023
04898ac
Replace type check by pattern match
cutiechi Feb 2, 2023
7efefeb
Merge pull request #193 from cutiechi/replace-type-check-by-pattern-m…
Jolanrensen Feb 5, 2023
e48464e
Update spark to 3.3.2
devongleeson Jul 20, 2023
5054b5b
updated kotlin-jupter version, set its java version to 8
Jolanrensen Jul 21, 2023
e52a517
Merge pull request #200 from Kotlin/jupyter-java-8
Jolanrensen Jul 21, 2023
b65c3d5
Merge branch 'main' into spark-3.3.2
devongleeson Jul 21, 2023
e06ed34
update gradle.properties to reflect spark 3.3.2 version change
devongleeson Jul 21, 2023
f7f351e
update docs to reflect spark update
devongleeson Jul 21, 2023
40d1d46
Merge pull request #198 from devongleeson/spark-3.3.2
Jolanrensen Jul 24, 2023
4719e26
added spark-yarn to jupyter integration by default
Jolanrensen Jul 24, 2023
b65bd0f
Merge pull request #201 from Kotlin/spark-yarn
Jolanrensen Jul 24, 2023
97f0fa4
version bumps
Jolanrensen Jul 24, 2023
8485391
Revert "version bumps"
Jolanrensen Jul 24, 2023
24f6219
keep hadoop at 3.3.1
Jolanrensen Jul 25, 2023
95b29f6
dokka to 1.8.20
Jolanrensen Jul 25, 2023
26cd005
kotlin to 1.8.20
Jolanrensen Jul 25, 2023
f8a581a
hadoop to 3.3.6
Jolanrensen Jul 25, 2023
c9209ab
Merge branch 'main' into version-bumps
Jolanrensen Jul 25, 2023
3fba13c
Merge pull request #202 from Kotlin/version-bumps
Jolanrensen Jul 25, 2023
ee9b8ea
set version to 1.2.4 release
Jolanrensen Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace type check by pattern match
  • Loading branch information
@cutiechi
cutiechi committed Feb 2, 2023
commit ba13a5916d740c779840d7112558fb7ceb602a70
18 changes: 9 additions & 9 deletions core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ object CatalystTypeConverters {
final def toCatalyst(@Nullable maybeScalaValue: Any): CatalystType = {
if (maybeScalaValue == null) {
null.asInstanceOf[CatalystType]
} else if (maybeScalaValue.isInstanceOf[Option[ScalaInputType]]) {
val opt = maybeScalaValue.asInstanceOf[Option[ScalaInputType]]
if (opt.isDefined) {
toCatalystImpl(opt.get)
} else {
null.asInstanceOf[CatalystType]
}
} else {
toCatalystImpl(maybeScalaValue.asInstanceOf[ScalaInputType])
} else maybeScalaValue match {
case opt: Option[ScalaInputType] =>
if (opt.isDefined) {
toCatalystImpl(opt.get)
} else {
null.asInstanceOf[CatalystType]
}
case _ =>
toCatalystImpl(maybeScalaValue.asInstanceOf[ScalaInputType])
}
}

Expand Down