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-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
