Skip to content

[SPARK-52524] Support Timestamp type #202

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 1 commit into from
Closed

[SPARK-52524] Support Timestamp type #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions Sources/SparkConnect/DataFrame.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,22 @@ public actor DataFrame: Sendable {
values.append(array.asAny(i) as? Decimal)
case .primitiveInfo(.date32):
values.append(array.asAny(i) as! Date)
case .timeInfo(.timestamp):
let timestampType = column.data.type as! ArrowTypeTimestamp
assert(timestampType.timezone == "Etc/UTC")
let timestamp = array.asAny(i) as! Int64
let timeInterval =
switch timestampType.unit {
case .seconds:
TimeInterval(timestamp)
case .milliseconds:
TimeInterval(timestamp) / 1_000
case .microseconds:
TimeInterval(timestamp) / 1_000_000
case .nanoseconds:
TimeInterval(timestamp) / 1_000_000_000
}
values.append(Date(timeIntervalSince1970: timeInterval))
case ArrowType.ArrowBinary:
values.append((array as! AsString).asString(i).utf8)
case .complexInfo(.strct):
Expand Down
2 changes: 2 additions & 0 deletions Sources/SparkConnect/Row.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public struct Row: Sendable, Equatable {
return a == b
} else if let a = x as? Decimal, let b = y as? Decimal {
return a == b
} else if let a = x as? Date, let b = y as? Date {
return a == b
} else if let a = x as? String, let b = y as? String {
return a == b
} else {
Expand Down
13 changes: 13 additions & 0 deletions Tests/SparkConnectTests/DataFrameTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,19 @@ struct DataFrameTests {
#expect(try await df.collect() == expected)
await spark.stop()
}

@Test
func timestamp() async throws {
let spark = try await SparkSession.builder.getOrCreate()
let df = try await spark.sql(
"SELECT TIMESTAMP '2025-05-01 16:23:40', TIMESTAMP '2025-05-01 16:23:40.123456'")
let expected = [
Row(
Date(timeIntervalSince1970: 1746116620.0), Date(timeIntervalSince1970: 1746116620.123456))
]
#expect(try await df.collect() == expected)
await spark.stop()
}
#endif

@Test
Expand Down
Loading