You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "dongjoon-hyun (via GitHub)" <gi...@apache.org> on 2025/04/03 06:52:49 UTC
[PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
dongjoon-hyun opened a new pull request, #40:
URL: https://github.com/apache/spark-connect-swift/pull/40
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "LuciferYang (via GitHub)" <gi...@apache.org>.
LuciferYang commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026752332
##########
Tests/SparkConnectTests/CaseInsensitiveDictionaryTests.swift:
##########
@@ -0,0 +1,87 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+import Testing
+
+@testable import SparkConnect
+
+/// A test suite for `CaseInsensitiveDictionary`
+struct CaseInsensitiveDictionaryTests {
+ @Test
+ func empty() async throws {
+ let dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+ }
+
+ @Test
+ func originalDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.count == 1)
+ #expect(dict.originalDictionary.count == 2)
+ }
+
+ @Test
+ func toDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.toDictionary().count == 2)
+ }
+
+ @Test
+ func `subscript`() async throws {
+ var dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+
+ dict["KEY1"] = "value1"
+ #expect(dict.count == 1)
+ #expect(dict["key1"] as! String == "value1")
+ #expect(dict["KEY1"] as! String == "value1")
+ #expect(dict["KeY1"] as! String == "value1")
+
+ dict["key2"] = false
+ #expect(dict.count == 2)
+ #expect(dict["kEy2"] as! Bool == false)
+
+ dict["key3"] = 2025
+ #expect(dict.count == 3)
+ #expect(dict["key3"] as! Int == 2025)
Review Comment:
Is the scenario where `dict["key3"] = nil` is supported as expected? I tested it, and the result seems to be correct.
##########
Sources/SparkConnect/CaseInsensitiveDictionary.swift:
##########
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+import Foundation
+
+/// A dictionary in which keys are case insensitive. The input dictionary can be
+/// accessed for cases where case-sensitive information is required.
+public struct CaseInsensitiveDictionary: Sendable {
+ public var originalDictionary: [String: Sendable]
+ private var keyLowerCasedDictionary: [String: Sendable] = [:]
+
+ init(_ originalDictionary: [String: Sendable] = [:]) {
+ self.originalDictionary = originalDictionary
+ for (key, value) in originalDictionary {
+ keyLowerCasedDictionary[key.lowercased()] = value
+ }
+ }
+
+ subscript(key: String) -> Sendable? {
+ get {
+ return keyLowerCasedDictionary[key.lowercased()]
+ }
+ set {
+ var newMap = originalDictionary.filter { $0.key.caseInsensitiveCompare(key) != .orderedSame }
+ newMap[key] = newValue
+ self.originalDictionary = newMap
+ self.keyLowerCasedDictionary[key.lowercased()] = newValue
+ }
+ }
+
+ public func toDictionary() -> [String: Sendable] {
+ return originalDictionary
+ }
+
+ public func toStringDictionary() -> [String: String] {
+ var dict = [String: String]()
Review Comment:
`return originalDictionary.mapValues { String(describing: $0) }` appears to be more concise, but it might be slower than the current implementation?
##########
Sources/SparkConnect/CaseInsensitiveDictionary.swift:
##########
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+import Foundation
+
+/// A dictionary in which keys are case insensitive. The input dictionary can be
+/// accessed for cases where case-sensitive information is required.
+public struct CaseInsensitiveDictionary: Sendable {
+ public var originalDictionary: [String: Sendable]
+ private var keyLowerCasedDictionary: [String: Sendable] = [:]
+
+ init(_ originalDictionary: [String: Sendable] = [:]) {
+ self.originalDictionary = originalDictionary
+ for (key, value) in originalDictionary {
+ keyLowerCasedDictionary[key.lowercased()] = value
+ }
+ }
+
+ subscript(key: String) -> Sendable? {
+ get {
+ return keyLowerCasedDictionary[key.lowercased()]
+ }
+ set {
+ var newMap = originalDictionary.filter { $0.key.caseInsensitiveCompare(key) != .orderedSame }
Review Comment:
how about
```
set {
let lowerKey = key.lowercased()
if let newValue = newValue {
keyLowerCasedDictionary[lowerKey] = newValue
} else {
keyLowerCasedDictionary.removeValue(forKey: lowerKey)
}
originalDictionary = originalDictionary.filter { $0.key.lowercased() != lowerKey }
if let newValue = newValue {
originalDictionary[key] = newValue
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026851448
##########
Sources/SparkConnect/CaseInsensitiveDictionary.swift:
##########
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+import Foundation
+
+/// A dictionary in which keys are case insensitive. The input dictionary can be
+/// accessed for cases where case-sensitive information is required.
+public struct CaseInsensitiveDictionary: Sendable {
+ public var originalDictionary: [String: Sendable]
+ private var keyLowerCasedDictionary: [String: Sendable] = [:]
+
+ init(_ originalDictionary: [String: Sendable] = [:]) {
+ self.originalDictionary = originalDictionary
+ for (key, value) in originalDictionary {
+ keyLowerCasedDictionary[key.lowercased()] = value
+ }
+ }
+
+ subscript(key: String) -> Sendable? {
+ get {
+ return keyLowerCasedDictionary[key.lowercased()]
+ }
+ set {
+ var newMap = originalDictionary.filter { $0.key.caseInsensitiveCompare(key) != .orderedSame }
Review Comment:
Let me update with yours.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026842688
##########
Sources/SparkConnect/CaseInsensitiveDictionary.swift:
##########
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+import Foundation
+
+/// A dictionary in which keys are case insensitive. The input dictionary can be
+/// accessed for cases where case-sensitive information is required.
+public struct CaseInsensitiveDictionary: Sendable {
+ public var originalDictionary: [String: Sendable]
+ private var keyLowerCasedDictionary: [String: Sendable] = [:]
+
+ init(_ originalDictionary: [String: Sendable] = [:]) {
+ self.originalDictionary = originalDictionary
+ for (key, value) in originalDictionary {
+ keyLowerCasedDictionary[key.lowercased()] = value
+ }
+ }
+
+ subscript(key: String) -> Sendable? {
+ get {
+ return keyLowerCasedDictionary[key.lowercased()]
+ }
+ set {
+ var newMap = originalDictionary.filter { $0.key.caseInsensitiveCompare(key) != .orderedSame }
Review Comment:
Actually, the original code pattern roughly follows Apache Spark code pattern which creates a new map.
https://github.com/apache/spark/blob/510edd763b912a21883e8a0dbaa3f661fedec234/sql/api/src/main/scala/org/apache/spark/sql/catalyst/util/CaseInsensitiveMap.scala#L41
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026863313
##########
Tests/SparkConnectTests/CaseInsensitiveDictionaryTests.swift:
##########
@@ -0,0 +1,87 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+import Testing
+
+@testable import SparkConnect
+
+/// A test suite for `CaseInsensitiveDictionary`
+struct CaseInsensitiveDictionaryTests {
+ @Test
+ func empty() async throws {
+ let dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+ }
+
+ @Test
+ func originalDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.count == 1)
+ #expect(dict.originalDictionary.count == 2)
+ }
+
+ @Test
+ func toDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.toDictionary().count == 2)
+ }
+
+ @Test
+ func `subscript`() async throws {
+ var dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+
+ dict["KEY1"] = "value1"
+ #expect(dict.count == 1)
+ #expect(dict["key1"] as! String == "value1")
+ #expect(dict["KEY1"] as! String == "value1")
+ #expect(dict["KeY1"] as! String == "value1")
+
+ dict["key2"] = false
+ #expect(dict.count == 2)
+ #expect(dict["kEy2"] as! Bool == false)
+
+ dict["key3"] = 2025
+ #expect(dict.count == 3)
+ #expect(dict["key3"] as! Int == 2025)
Review Comment:
Yes, the removal of keys are working as you expected.
Initially, I thought you are saying that supporting `nil` as a valid value. That is not supported because we are using `[String: Sendable]` type. To support `nil` as a value, we need to use `[String: Sendable?]`.
Anyway, you are right in terms of the removal of keys. I accepted all the other code suggestions too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#issuecomment-2775546402
Thank you for review, @LuciferYang . The updated PR looks much better to me. 😄
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026834230
##########
Tests/SparkConnectTests/CaseInsensitiveDictionaryTests.swift:
##########
@@ -0,0 +1,87 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+import Testing
+
+@testable import SparkConnect
+
+/// A test suite for `CaseInsensitiveDictionary`
+struct CaseInsensitiveDictionaryTests {
+ @Test
+ func empty() async throws {
+ let dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+ }
+
+ @Test
+ func originalDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.count == 1)
+ #expect(dict.originalDictionary.count == 2)
+ }
+
+ @Test
+ func toDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.toDictionary().count == 2)
+ }
+
+ @Test
+ func `subscript`() async throws {
+ var dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+
+ dict["KEY1"] = "value1"
+ #expect(dict.count == 1)
+ #expect(dict["key1"] as! String == "value1")
+ #expect(dict["KEY1"] as! String == "value1")
+ #expect(dict["KeY1"] as! String == "value1")
+
+ dict["key2"] = false
+ #expect(dict.count == 2)
+ #expect(dict["kEy2"] as! Bool == false)
+
+ dict["key3"] = 2025
+ #expect(dict.count == 3)
+ #expect(dict["key3"] as! Int == 2025)
Review Comment:
For now, it's not expected because we use `Sendable` as value.
```
public var originalDictionary: [String: Sendable]
```
To accept `nil`, the originalDictionary `[String:Sendable?]`.
```
1> let dic: [String:Sendable?] = ["a": nil]
dic: [String : Sendable?] = 1 key/value pair {
[0] = {
key = "a"
value = nil
}
}
2> dic["a"]
$R0: Sendable?? = nil
```
BTW, `DataFrameWriter` and `DataFrameReader` currently uses the generated Swift code which requires `[String: String]` only.
https://github.com/apache/spark-connect-swift/blob/f073e56826a184e8cb5d3f510e84410a1f88040e/Sources/SparkConnect/relations.pb.swift#L997
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "LuciferYang (via GitHub)" <gi...@apache.org>.
LuciferYang commented on PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#issuecomment-2774677025
Sure, I'll take a look at it later.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026837124
##########
Sources/SparkConnect/CaseInsensitiveDictionary.swift:
##########
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+import Foundation
+
+/// A dictionary in which keys are case insensitive. The input dictionary can be
+/// accessed for cases where case-sensitive information is required.
+public struct CaseInsensitiveDictionary: Sendable {
+ public var originalDictionary: [String: Sendable]
+ private var keyLowerCasedDictionary: [String: Sendable] = [:]
+
+ init(_ originalDictionary: [String: Sendable] = [:]) {
+ self.originalDictionary = originalDictionary
+ for (key, value) in originalDictionary {
+ keyLowerCasedDictionary[key.lowercased()] = value
+ }
+ }
+
+ subscript(key: String) -> Sendable? {
+ get {
+ return keyLowerCasedDictionary[key.lowercased()]
+ }
+ set {
+ var newMap = originalDictionary.filter { $0.key.caseInsensitiveCompare(key) != .orderedSame }
+ newMap[key] = newValue
+ self.originalDictionary = newMap
+ self.keyLowerCasedDictionary[key.lowercased()] = newValue
+ }
+ }
+
+ public func toDictionary() -> [String: Sendable] {
+ return originalDictionary
+ }
+
+ public func toStringDictionary() -> [String: String] {
+ var dict = [String: String]()
Review Comment:
Thank you. I updated it with your suggestion.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#discussion_r2026834230
##########
Tests/SparkConnectTests/CaseInsensitiveDictionaryTests.swift:
##########
@@ -0,0 +1,87 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+import Testing
+
+@testable import SparkConnect
+
+/// A test suite for `CaseInsensitiveDictionary`
+struct CaseInsensitiveDictionaryTests {
+ @Test
+ func empty() async throws {
+ let dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+ }
+
+ @Test
+ func originalDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.count == 1)
+ #expect(dict.originalDictionary.count == 2)
+ }
+
+ @Test
+ func toDictionary() async throws {
+ let dict = CaseInsensitiveDictionary([
+ "key1": "value1",
+ "KEY1": "VALUE1",
+ ])
+ #expect(dict.toDictionary().count == 2)
+ }
+
+ @Test
+ func `subscript`() async throws {
+ var dict = CaseInsensitiveDictionary([:])
+ #expect(dict.count == 0)
+
+ dict["KEY1"] = "value1"
+ #expect(dict.count == 1)
+ #expect(dict["key1"] as! String == "value1")
+ #expect(dict["KEY1"] as! String == "value1")
+ #expect(dict["KeY1"] as! String == "value1")
+
+ dict["key2"] = false
+ #expect(dict.count == 2)
+ #expect(dict["kEy2"] as! Bool == false)
+
+ dict["key3"] = 2025
+ #expect(dict.count == 3)
+ #expect(dict["key3"] as! Int == 2025)
Review Comment:
For now, it's not expected because we use `Sendable` as value.
```
public var originalDictionary: [String: Sendable]
```
To accept `nil`, the originalDictionary `[String:Sendable?]`.
```
1> let dic: [String:Sendable?] = ["a": nil]
dic: [String : Sendable?] = 1 key/value pair {
[0] = {
key = "a"
value = nil
}
}
2> dic["a"]
$R0: Sendable?? = nil
```
BTW, `DataFrameWriter` and `DataFrameReader` currently uses the generated Swift code which requires `[String: String]` only.
https://github.com/apache/spark-connect-swift/blob/f073e56826a184e8cb5d3f510e84410a1f88040e/Sources/SparkConnect/relations.pb.swift#L997
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#issuecomment-2775584697
Thank you again, @LuciferYang . Merged to main.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun closed pull request #40: [SPARK-51708] Add `CaseInsensitiveDictionary`
URL: https://github.com/apache/spark-connect-swift/pull/40
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#issuecomment-2774672269
Could you review this PR when you have some time, @LuciferYang ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-51708] Add `CaseInsensitiveDictionary` [spark-connect-swift]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #40:
URL: https://github.com/apache/spark-connect-swift/pull/40#issuecomment-2774679363
Thank you so much. Take your time~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org