Skip to content

[SPARK-52319] Add (Catalog|Schema|TableOrView)NotFound to SparkConnectError #178

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

Closed
wants to merge 2 commits into from
+31 −9
Closed

[SPARK-52319] Add (Catalog|Schema|TableOrView)NotFound to SparkConnectError #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603f0e4
[SPARK-52319] Add `(Catalog|Schema|TableOrView)NotFound` to `SparkCon…
dongjoon-hyun May 27, 2025
b8473d4
handle Spark 3.5
dongjoon-hyun May 27, 2025
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
15 changes: 14 additions & 1 deletion Sources/SparkConnect/DataFrame.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,20 @@ public actor DataFrame: Sendable {
),
interceptors: spark.client.getIntercepters()
) { client in
return try await f(client)
do {
return try await f(client)
} catch let error as RPCError where error.code == .internalError {
switch error.message {
case let m where m.contains("CATALOG_NOT_FOUND"):
throw SparkConnectError.CatalogNotFound
case let m where m.contains("SCHEMA_NOT_FOUND"):
throw SparkConnectError.SchemaNotFound
case let m where m.contains("TABLE_OR_VIEW_NOT_FOUND"):
throw SparkConnectError.TableOrViewNotFound
default:
throw error
}
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions Sources/SparkConnect/SparkConnectError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@

/// A enum for ``SparkConnect`` package errors
public enum SparkConnectError: Error {
case CatalogNotFound
case InvalidArgument
case InvalidSessionID
case InvalidType
case SchemaNotFound
case TableOrViewNotFound
case UnsupportedOperation
}
14 changes: 7 additions & 7 deletions Tests/SparkConnectTests/CatalogTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct CatalogTests {
func setCurrentCatalog() async throws {
let spark = try await SparkSession.builder.getOrCreate()
try await spark.catalog.setCurrentCatalog("spark_catalog")
try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.CatalogNotFound) {
try await spark.catalog.setCurrentCatalog("not_exist_catalog")
}
await spark.stop()
Expand All @@ -63,7 +63,7 @@ struct CatalogTests {
func setCurrentDatabase() async throws {
let spark = try await SparkSession.builder.getOrCreate()
try await spark.catalog.setCurrentDatabase("default")
try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.SchemaNotFound) {
try await spark.catalog.setCurrentDatabase("not_exist_database")
}
await spark.stop()
Expand Down Expand Up @@ -91,7 +91,7 @@ struct CatalogTests {
#expect(db.catalog == "spark_catalog")
#expect(db.description == "default database")
#expect(db.locationUri.hasSuffix("spark-warehouse"))
try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.SchemaNotFound) {
try await spark.catalog.getDatabase("not_exist_database")
}
await spark.stop()
Expand Down Expand Up @@ -313,7 +313,7 @@ struct CatalogTests {
try await spark.catalog.cacheTable(tableName, StorageLevel.MEMORY_ONLY)
})

try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.TableOrViewNotFound) {
try await spark.catalog.cacheTable("not_exist_table")
}
await spark.stop()
Expand All @@ -330,7 +330,7 @@ struct CatalogTests {
#expect(try await spark.catalog.isCached(tableName))
})

try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.TableOrViewNotFound) {
try await spark.catalog.isCached("not_exist_table")
}
await spark.stop()
Expand All @@ -351,7 +351,7 @@ struct CatalogTests {
#expect(try await spark.catalog.isCached(tableName))
})

try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.TableOrViewNotFound) {
try await spark.catalog.refreshTable("not_exist_table")
}
await spark.stop()
Expand Down Expand Up @@ -386,7 +386,7 @@ struct CatalogTests {
#expect(try await spark.catalog.isCached(tableName) == false)
})

try await #require(throws: Error.self) {
try await #require(throws: SparkConnectError.TableOrViewNotFound) {
try await spark.catalog.uncacheTable("not_exist_table")
}
await spark.stop()
Expand Down
Loading